From 0b76d5b89809423a36b779a3aef42b026be0fb75 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Dec 2018 08:58:16 +0100
Subject: [PATCH] openjdk: add binary bootstrap package for 1.7

adapt 1.8 to pick up the 1.7 package.
---
 .../openjdk/openjdk7_bin-1.7.u80_b32.recipe   | 53 +++++++++++++++++++
 dev-lang/openjdk/openjdk8-1.8.u192_b26.recipe |  5 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 dev-lang/openjdk/openjdk7_bin-1.7.u80_b32.recipe

diff --git a/dev-lang/openjdk/openjdk7_bin-1.7.u80_b32.recipe b/dev-lang/openjdk/openjdk7_bin-1.7.u80_b32.recipe
new file mode 100644
index 000000000..2aaab8f41
--- /dev/null
+++ b/dev-lang/openjdk/openjdk7_bin-1.7.u80_b32.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Open-source implementation of the Java Platform, SE"
+DESCRIPTION="OpenJDK (Open Java Development Kit) is a free and open source \
+implementation of the Java Platform, Standard Edition (Java SE). It is the \
+result of an effort Sun Microsystems began in 2006. The implementation is \
+licensed under the GNU General Public License (GNU GPL) with a linking \
+exception. Were it not for the GPL linking exception, components that linked \
+to the Java class library would be subject to the terms of the GPL license. \
+OpenJDK is the official Java SE 7 reference implementation."
+HOMEPAGE="http://openjdk.java.net/"
+COPYRIGHT="2012 Oracle and/or its affiliates."
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://korli.keybase.pub/openjdk_x86-1.7.u80_b32-3-x86_gcc2.hpkg#noarchive"
+CHECKSUM_SHA256="1fb7a47c0b5b630905884eee3a080b35a3cd2b1d8dbe9ecfe8d0206c1f39e76a"
+
+ARCHITECTURES="!x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+DISABLE_SOURCE_PACKAGE="yes"
+
+PROVIDES="
+	openjdk7_bin$secondaryArchSuffix = $portVersion compat >= 1.7
+	java:environment = 7
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku
+	"
+
+BUILD_PREREQUIRES="
+	"
+
+INSTALL()
+{
+	package extract $sourceDir/openjdk_x86-1.7.u80_b32-3-x86_gcc2.hpkg \
+		lib/x86/openjdk
+
+	jdkDir=$libDir/openjdk7
+	mkdir -p $(dirname $jdkDir)
+	mv lib/x86/openjdk $jdkDir
+
+	# create a profile.d file that sets up JDK7_HOME
+	jdkProfile=$dataDir/profile.d/openjdk7.sh
+	mkdir -p $(dirname $jdkProfile)
+	echo "JDK7_HOME=$jdkDir" > $jdkProfile
+	echo "export JDK7_HOME" >> $jdkProfile
+}
diff --git a/dev-lang/openjdk/openjdk8-1.8.u192_b26.recipe b/dev-lang/openjdk/openjdk8-1.8.u192_b26.recipe
index e5f343cd4..79deb5a42 100644
--- a/dev-lang/openjdk/openjdk8-1.8.u192_b26.recipe
+++ b/dev-lang/openjdk/openjdk8-1.8.u192_b26.recipe
@@ -136,7 +136,7 @@ REQUIRES_sources="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	openjdk$secondaryArchSuffix >= 1.7
+	java:environment == 7
 	ca_root_certificates
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
@@ -168,6 +168,9 @@ TEST_REQUIRES="
 
 BUILD()
 {
+	source /system/data/profile.d/openjdk7.sh
+	export PATH=$JDK7_HOME/bin:$PATH
+
 	# prepare the directory structure
 	ln -sfn $sourceDir2 hotspot
 	ln -sfn $sourceDir3 jdk