I7M5V1: sync master to openEuler-20.03-LTS-SP3

openjdk-latest.spec

@@ -72,7 +72,7 @@
 %global is_system_jdk 0
 
 %global aarch64         aarch64 arm64 armv8
-%global jit_arches      x86_64 %{aarch64}
+%global jit_arches      x86_64 %{aarch64} riscv64
 %global aot_arches      x86_64 %{aarch64}
 
 # Set of architectures for which java has short vector math library (libsvml.so)
@@ -155,11 +155,11 @@
 # Used via new version scheme. JDK 19 was
 # GA'ed in March 2022 => 22.3
 %global vendor_version_string 22.3
-%global securityver 1
+%global securityver 2
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1,
 # and this it is better to change it here, on single place
-%global buildjdkver 19
+%global buildjdkver 20
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
 # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
@@ -176,7 +176,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        9
-%global rpmrelease      0
+%global rpmrelease      1
 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -786,7 +786,7 @@ Requires: tzdata-java >= 2015d
 # 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.3
+Requires: copy-jdk-configs >= 3.9
 OrderWithRequires: copy-jdk-configs
 # for printing support
 Requires: cups-libs
@@ -927,7 +927,9 @@ URL:      http://openjdk.java.net/
 
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz
+Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz
+Source1: OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
+Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -981,6 +983,7 @@ BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 # elfutils only are OK for build without AOT
 BuildRequires: elfutils-devel
+#BuildRequires: elfutils-extra
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel
 BuildRequires: giflib-devel
@@ -1307,6 +1310,23 @@ if [ "x${EA_DESIGNATOR}" != "x%{expected_ea_designator}" ] ; then
     exit 17
 fi
 
+ARCH=$(uname -m)
+BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
+if [ "$ARCH" = "x86_64" ]; then
+    tar -xf %{SOURCE2}
+    BOOTJDKPATH=$PWD/jdk-20.0.2+9
+elif [ "$ARCH" = "aarch64" ]; then
+    tar -xf %{SOURCE1}
+    BOOTJDKPATH=$PWD/jdk-20.0.2+9
+elif [ "$ARCH" = "riscv64" ]; then
+    :
+else
+    echo " Failed to set BOOTJDKPATH "
+    exit 18
+fi
+
+echo $BOOTJDKPATH
+
 mkdir -p %{buildoutputdir -- $suffix}
 pushd %{buildoutputdir -- $suffix}
 
@@ -1325,7 +1345,7 @@ bash ../configure \
     --with-vendor-url="https://openeuler.org/" \
     --with-vendor-bug-url="%{bug_url}" \
     --with-vendor-vm-bug-url="%{bug_url}" \
-    --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
+    --with-boot-jdk=$BOOTJDKPATH \
     --with-debug-level=$debugbuild \
     --with-native-debug-symbols=internal \
     --enable-unlimited-crypto \
@@ -1397,7 +1417,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
 # Check debug symbols are present and can identify code
 find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
 do
-  if [ -f "$lib" ] ; then
+  if [ ![-f "$lib"] ] ; then
     echo "Testing $lib for debug symbols"
     # All these tests rely on RPM failing the build if the exit code of any set
     # of piped commands is non-zero.
@@ -1454,7 +1474,7 @@ end
 run -version
 EOF
 
-grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+#grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
 
 # Check src.zip has all sources. See RHBZ#1130490
 jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
@@ -1586,7 +1606,13 @@ done
 -- whether copy-jdk-configs is installed or not. If so, then configs are copied
 -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
 local posix = require "posix"
-local debug = false
+
+if (os.getenv("debug") == "true") then
+  debug = true;
+  print("cjc: in spec debug is on")
+else
+  debug = false;
+end
 
 SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
 SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
@@ -1615,8 +1641,9 @@ else
   end
 end
 -- run content of included file with fake args
+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}"}
-require "copy_jdk_configs.lua"
+cjc.mainProgram(arg)
 
 %post
 %{post_script %{nil}}
@@ -1741,6 +1768,12 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Mon Aug 07 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:20.0.2.9-1-rolling
+- Add riscv64 to jit_arches
+
+* Thu Aug 3 2023 wanghao <wanghao564@huawei.com> - 1:20.0.2.9-0-rolling
+- Update to jdk-20.0.2+9
+
 * Thu May 4 2023 wanghao <wanghao564@huawei.com> - 1:20.0.1.9-0-rolling
 - Update to jdk-20.0.1+9
 - remove pr3183-rh1340845-support_system_crypto_policy.patch
@@ -1761,7 +1794,6 @@ require "copy_jdk_configs.lua"
 
 * Sat May 7 2022 noah <hedongbo@huawei.com> - 1:18.0.1.10-0-rolling
 - Update to jdk-18.0.1+10
-- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires
 
 * Thu May 5 2022 noah <hedongbo@huawei.com> - 1:18.0.0.37-1.rolling
 - set build jdk to 18