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 f77477755ff28901cf5c15394a3c174ef1dfb3db..3e99528b9184278f90d49afbda2da81438f9731f 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -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). @@ -964,7 +966,7 @@ Source2: README.md Source8: tapsets-icedtea-%{icedteaver}.tar.xz # Desktop files. Adapted from IcedTea -Source9: jconsole.desktop.in +Source9: jconsole.desktop.in Source10: policytool.desktop.in # nss configuration file @@ -1344,7 +1346,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 @@ -1885,12 +1887,26 @@ for file in %{SOURCE9} %{SOURCE10} ; do EXT="${FILE##*.}" NAME="${FILE%.*}" OUTPUT_FILE=$NAME$suffix.$EXT - sed -e "s:_SDKBINDIR_:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE + sed -e "s:_SDKBINDIR_:%{_jvmdir}/%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE + cat $file + echo "hhhhhhhhhhh" + cat $file + echo "jjjjjjjjjjjjj" + cat $OUTPUT_FILE + echo "kkkkkkkkkkkkkkk" sed -i -e "s:_JREBINDIR_:%{jrebindir -- $suffix}:g" $OUTPUT_FILE + cat $OUTPUT_FILE sed -i -e "s:@target_cpu@:%{_arch}:g" $OUTPUT_FILE + echo "lllllllllll" + cat $OUTPUT_FILE sed -i -e "s:@OPENJDK_VER@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE + cat $OUTPUT_FILE + echo "mmmmmmmmmmmmm" sed -i -e "s:@JAVA_VER@:%{javaver}:g" $OUTPUT_FILE + cat $OUTPUT_FILE + echo "nnnnnnnnnnnnnnnnn" sed -i -e "s:@JAVA_VENDOR@:%{origin}:g" $OUTPUT_FILE + cat $OUTPUT_FILE done done @@ -1937,6 +1953,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} @@ -1955,6 +1988,7 @@ bash ${top_srcdir_abs_path}/configure \ --with-native-debug-symbols=internal \ --with-milestone="fcs" \ --with-update-version=%{updatever} \ + --with-boot-jdk=$BOOTJDKPATH \ --with-build-number=%{buildver} \ --with-company-name="Bisheng" \ --with-vendor-name="Bisheng" \ @@ -2100,7 +2134,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" @@ -2482,6 +2516,9 @@ cjc.mainProgram(arg) %endif %changelog +* Wed Aug 30 2023 kuenking111 - 1:1.8.0.382-b05.5 +- del test + * Wed Aug 30 2023 kuenking111 - 1:1.8.0.382-b05.5 - del 0022-8198510-Enable-UseDynamicNumberOfGCThreads-by-defaul.patch