From fb98fce8873537f66f4e7eb720a0d5d183a2c5c4 Mon Sep 17 00:00:00 2001
From: Weisson <Weisson@linux.alibaba.com>
Date: Sun, 2 Jul 2023 05:25:32 +0800
Subject: [PATCH] OpenJDK 11 bootstrap.

Signed-off-by: Weisson <Weisson@linux.alibaba.com>
---
 java-11-openjdk.spec | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index f33da50..8db96ef 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -21,7 +21,7 @@
 # Enable release builds by default on relevant arches.
 %bcond_without release
 # Enable static library builds by default.
-%bcond_without staticlibs
+%bcond_with staticlibs
 # Remove build artifacts by default
 %bcond_with artifacts
 # Build a fresh libjvm.so for use in a copy of the bootstrap JDK
@@ -385,8 +385,8 @@
 %global buildver        7
 %global rpmrelease      4
 # Settings used by the portable build
-%global portablerelease 2
-%global portablesuffix el8
+%global portablerelease 2%{anolis_release}
+%global portablesuffix an8
 %global portablebuilddir /builddir/build/BUILD
 
 #%%global tagsuffix     %%{nil}
@@ -1354,13 +1354,13 @@ Source20: java-%{featurever}-openjdk-portable.specfile
 
 # Setup variables to reference correct sources
 %global releasezip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.unstripped.jdk..%{_arch}.tar.xz
-%global staticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.static-libs..%{_arch}.tar.xz
+%global staticlibzip  %{_jvmdir}/%{name}-%{version}-%{portablerelease}%{dist}.%{_arch}.tar.xz
 %global docszip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.docs..%{_arch}.tar.xz
 %global misczip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.misc..%{_arch}.tar.xz
 %global slowdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.jdk..%{_arch}.tar.xz
-%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.static-libs..%{_arch}.tar.xz
+%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}%{dist}.%{_arch}.tar.xz
 %global fastdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.jdk..%{_arch}.tar.xz
-%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.static-libs..%{_arch}.tar.xz
+%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}%{dist}.%{_arch}.tar.xz
 
 ############################################
 #
@@ -1978,9 +1978,10 @@ for suffix in %{build_loop} ; do
 
   # TODO: should verify checksums when using packages from buildroot
   tar -xJf ${jdkzip}
-  tar -xJf ${staticlibzip}
   mkdir -p $(dirname ${installdir})
-  mv java-%{featurever}-openjdk* ${installdir}
+
+  mv java-%{featurever}-openjdk*.jdk.* ${installdir}
+  # tar -xJf ${staticlibzip}
 
   # Fix build paths in ELF files so it looks like we built them
   portablenvr="%{name}-%{VERSION}-%{portablerelease}.%{portablesuffix}.%{_arch}"
@@ -2036,10 +2037,6 @@ export SEC_DEBUG="-Djava.security.debug=properties"
 $JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
 $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
 
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
-
 # Check java launcher has no SSB mitigation
 if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
 
@@ -2528,6 +2525,9 @@ end
 %endif
 
 %changelog
+* Sun Jul  2 2023 Weisson <Weisson@linux.alibaba.com> - 1:11.0.19.0.7-4.0.1
+- OpenJDK 11 bootstrap.
+
 * Sat Jul 01 2023 Liwei Ge <geliwei@openanolis.org> - 1:11.0.19.0.7-4.0.1
 - LoongArch64 init support (aoqi <aoqi@loongson.cn>)
 - Adjust loongarch64 patch (geliwei@openanolis.org)
-- 
Gitee