packages/openjdk-latest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set bootjdkpath to fixed version

Browse Source
This commit is contained in:
DXwangg 2023-07-27 10:16:13 +08:00
parent 5d6cb7ca36
commit cbf7d23f42
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz Normal file
View File

Binary file not shown.

BIN
OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz Normal file
View File

Binary file not shown.

23
openjdk-latest.spec
View File

@ -928,6 +928,8 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # 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 # 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-jdk%{majorver}-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 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea # Desktop files. Adapted from IcedTea
@ -1308,6 +1310,21 @@ if [ "x${EA_DESIGNATOR}" != "x%{expected_ea_designator}" ] ; then
exit 17 exit 17
fi 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
else
echo " Failed to set BOOTJDKPATH "
exit 18
fi
echo $BOOTJDKPATH
mkdir -p %{buildoutputdir -- $suffix} mkdir -p %{buildoutputdir -- $suffix}
pushd %{buildoutputdir -- $suffix} pushd %{buildoutputdir -- $suffix}
@ -1326,7 +1343,7 @@ bash ../configure \
--with-vendor-url="https://openeuler.org/" \ --with-vendor-url="https://openeuler.org/" \
--with-vendor-bug-url="%{bug_url}" \ --with-vendor-bug-url="%{bug_url}" \
--with-vendor-vm-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-debug-level=$debugbuild \
--with-native-debug-symbols=internal \ --with-native-debug-symbols=internal \
--enable-unlimited-crypto \ --enable-unlimited-crypto \
@ -1398,7 +1415,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
# Check debug symbols are present and can identify code # Check debug symbols are present and can identify code
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
do do
if [ -f "$lib" ] ; then if [ ![-f "$lib"] ] ; then
echo "Testing $lib for debug symbols" echo "Testing $lib for debug symbols"
# All these tests rely on RPM failing the build if the exit code of any set # All these tests rely on RPM failing the build if the exit code of any set
# of piped commands is non-zero. # of piped commands is non-zero.
@ -1455,7 +1472,7 @@ end
run -version run -version
EOF EOF
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
# Check src.zip has all sources. See RHBZ#1130490 # Check src.zip has all sources. See RHBZ#1130490
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'