diff --git a/OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz b/OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz new file mode 100755 index 0000000000000000000000000000000000000000..47535a2f0e77fcc9f08412364454cd3c3a8115f4 Binary files /dev/null and b/OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz differ diff --git a/OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz b/OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz new file mode 100755 index 0000000000000000000000000000000000000000..2fe42e862727c971449db1d5602cb13cec94f869 Binary files /dev/null and b/OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz differ diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 2ba3fd282819eca1e0966d11fd2dfc6600690a2c..b51ff460afbf1366a611fb61d199b78894682530 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -829,7 +829,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION} # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression -Requires: copy-jdk-configs >= 3.9 +Requires: copy-jdk-configs >= 4.0 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2 +Release: 3 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -957,6 +957,8 @@ Source0: %{full_revision}.tar.xz # Custom README for -src subpackage Source2: README.md +Source3: OpenJDK8U-jdk_x64_linux_hotspot_8u382b05.tar.gz +Source4: OpenJDK8U-jdk_aarch64_linux_hotspot_8u382b05.tar.gz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (3.x). @@ -1376,7 +1378,7 @@ BuildRequires: zip BuildRequires: unzip BuildRequires: openssl-devel -BuildRequires: java-1.8.0-openjdk-devel +#BuildRequires: java-1.8.0-openjdk-devel BuildRequires: tzdata-java >= 2015d # Earlier versions have a bug in tree vectorization on PPC @@ -2000,6 +2002,23 @@ fi # Variable used in hs_err hook on build failures top_srcdir_abs_path=$(pwd)/%{top_level_dir_name} +ARCH=$(uname -m) +BOOTJDKPATH=/usr/lib/jvm/java-%{majorver}-openjdk +if [ "$ARCH" = "x86_64" ]; then + tar -xf %{SOURCE3} + BOOTJDKPATH=$PWD/jdk8u382-b05 +elif [ "$ARCH" = "aarch64" ]; then + tar -xf %{SOURCE4} + BOOTJDKPATH=$PWD/jdk8u382-b05 +elif [ "$ARCH" = "riscv64" ]; then + : +else + echo " Failed to set BOOTJDKPATH " + exit 18 +fi + +echo $BOOTJDKPATH + mkdir -p %{buildoutputdir -- $suffix} pushd %{buildoutputdir -- $suffix} @@ -2015,6 +2034,7 @@ bash ${top_srcdir_abs_path}/configure \ %ifnarch %{jit_arches} --with-jvm-variants=zero \ %endif + --with-boot-jdk=$BOOTJDKPATH \ --with-native-debug-symbols=internal \ --with-milestone="fcs" \ --with-update-version=%{updatever} \ @@ -2163,7 +2183,7 @@ EOF #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out # Check src.zip has all sources. See RHBZ#1130490 -jar -tf $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe' +$JAVA_HOME/bin/jar -tf $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe' # Check class files include useful debugging information $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" @@ -2372,12 +2392,7 @@ done -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" -if (os.getenv("debug") == "true") then - debug = true; - print("cjc: in spec debug is on") -else - debug = false; -end +local debug = false; SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2405,10 +2420,10 @@ else return end end --- run content of included file with fake args +arg = nil; cjc = require "copy_jdk_configs.lua" -arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(arg) +args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(args) %post %{post_script %{nil}} @@ -2545,6 +2560,9 @@ cjc.mainProgram(arg) %endif %changelog +* Wed Nov 8 2023 kuenking111 - 1:1.8.0.392-b08.3 +- fix copy_jdk_configs bad arguments #1 to gsub got nil + * Mon Oct 30 2023 kuenking111 - 1:1.8.0.392-b08.2 - remove add-8142508-To-bring-j.u.z.ZipFile-s-native-implemen.patch - remove add-8226530-ZipFile-reads-wrong-entry-size-from-ZIP6.patch