diff --git a/.abf.yml b/.abf.yml index b274723..f45a118 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,4 @@ sources: "shenandoah-jdk11-shenandoah-jdk-11.0.8+6-4curve.tar.xz": 675c2ab8b8793ab87d0cf9b77b2196b71f4afbca "tapsets-icedtea-3.15.0.tar.xz": 7ae2cba67467825b2c2a5fec7aea041865023002 + "OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz": 5627bcceee613c4764c120e941c8d24b3e5a6e33 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index f0bd701..87fa9a4 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -29,6 +29,8 @@ #use the standard one from java (temporarily) %bcond_with timezonejava +%bcond_with binary + # The -g flag says to use strip -g instead of full strip on DSOs or EXEs. # This fixes detailed NMT and other tools which need minimal debug info. # See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879 @@ -1092,6 +1094,8 @@ Source15: TestSecurityProperties.java # ROSA-specific Source300: %{name}.rpmlintrc +Source301: OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + ############################################ # # RPM/distribution specific patches @@ -1405,7 +1409,7 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then echo "You have disabled both include_debug_build and include_normal_build. That is a no go." exit 13 fi -%setup -q -c -n %{uniquesuffix ""} -T -a 0 +%setup -q -c -n %{uniquesuffix ""} -T -a 0 -b 301 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084 prioritylength=`expr length %{priority}` if [ $prioritylength -ne 8 ] ; then @@ -1536,7 +1540,11 @@ bash ../configure \ --with-vendor-url="https://www.redhat.com/" \ --with-vendor-bug-url="%{bugs}" \ --with-vendor-vm-bug-url="%{bugs}" \ +%if ! %{with binary} --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \ +%else + --with-boot-jdk="%{_builddir}/jdk-11.0.7+10" \ +%endif --with-debug-level=$debugbuild \ --with-native-debug-symbols=internal \ --enable-unlimited-crypto \