commit 0360f776d74390ac0c44d9935cc4767491441cc8 Author: Danny Rawlins <contact@romster.me> Date: Sun Aug 1 17:47:47 2021 +1000 openjdk11-jdk: 11.0.12+5 -> 11.0.12+7 diff --git a/openjdk11-jdk/.footprint b/openjdk11-jdk/.footprint index c7b43799f..e8460edf7 100644 --- a/openjdk11-jdk/.footprint +++ b/openjdk11-jdk/.footprint @@ -159,7 +159,6 @@ drwxr-xr-x root/root usr/lib/java/openjdk11-jdk/lib/jli/ -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libdt_socket.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libextnet.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libfontmanager.so --rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libharfbuzz.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libinstrument.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libj2gss.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libj2pcsc.so diff --git a/openjdk11-jdk/.signature b/openjdk11-jdk/.signature index 5a0a95d02..9289f2d81 100644 --- a/openjdk11-jdk/.signature +++ b/openjdk11-jdk/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36HWW89JdxA6N4ULM4OR3Ar404n4OumWpsqTi2SEAcEByZj5Bn2+CUbBn6cJQ/r+teUFnXWAzij4qpQj+Lf+Cwc= -SHA256 (Pkgfile) = 0f2fe43d78c819b8790281f02ad8b63ca717f6c7d4c0b46f20cc5ce39b535cba -SHA256 (.footprint) = c8ab3ec872b24b9ea40814b91dc3f78c20f56e29d7069d9b51a7fc7f42ca5a06 -SHA256 (jdk-11.0.12+5.tar.bz2) = d2845669a9791c2a807fcdc859b059e36c07d0b4e7c0b9e6bc3699a94d8809c2 +RWSagIOpLGJF330DmDBu1fPzwfCikPGDkbFt6Zjw/b52SAE/khJjvt5gAttQDzLu1Cop6KNyglDoE5qgJ+d/PRno28RVaIH6nw0= +SHA256 (Pkgfile) = 1acfc718344a7701ad890a493ee7523c43ef0bfbdc6093994fc0ce841d7abe01 +SHA256 (.footprint) = 03377f0471c2680d08f519ce02e0b2f9e6e3c34c4cd8fa7c695029043ca80666 +SHA256 (jdk-11.0.12+7.tar.bz2) = 03531735116e74644b729fc0b8663ed72f7c83ebe093c02f1887be89264d8b92 SHA256 (openjdk11-boot-20210620.tar.xz) = 03a0f8cb544282c589bd8e701311841a68558b93ea36cebf76e1f21c444e204b SHA256 (java_cacerts-20210620) = 860324d9e2ea9a54e93bbfc012896623596407abd3a47d395475a52e08f46a3e diff --git a/openjdk11-jdk/Pkgfile b/openjdk11-jdk/Pkgfile index 7ef7daada..5e49db2c8 100644 --- a/openjdk11-jdk/Pkgfile +++ b/openjdk11-jdk/Pkgfile @@ -5,7 +5,7 @@ # Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip name=openjdk11-jdk -version=11.0.12+5 +version=11.0.12+7 _boot_ver=20210620 _cert_ver=20210620 release=1 @@ -23,14 +23,23 @@ build() { export JAVA_HOME=$SRC/openjdk11-boot export PATH=$JAVA_HOME/bin:$OLD_PATH + export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/} + # Avoid optimization of HotSpot being lowered from O3 to O2 + local _CFLAGS+=" ${CFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _CXXFLAGS+=" ${CXXFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _LDFLAGS="${LDFLAGS}" + + [ -z $JOBS ] && JOBS=$(nproc) + + # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning + # in the output of ./configure unless used like such: + # --with-extra-cflags="${CFLAGS}" + # --with-extra-cxxflags="${CXXFLAGS}" + # --with-extra-ldflags="${LDFLAGS}" + # See also paragraph "Configure Control Variables" from common/doc/building.md unset CFLAGS unset CXXFLAGS unset LDFLAGS - unset MAKEFLAGS - export _CFLAGS+=' -fcommon' - export _CXXFLAGS+=' -fcommon' - - [ -z $JOBS ] && JOBS=$(nproc) mkdir $SRC/build cd $SRC/build @@ -54,13 +63,17 @@ build() { --with-version-build="${version#*+}" \ --with-vendor-name="CRUX" \ --with-jobs=$JOBS \ + --with-num-cores=$JOBS \ --with-libjpeg=system \ --with-giflib=system \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ - --with-extra-cflags="$_CFLAGS" \ - --with-extra-cxxflags="$_CXXFLAGS" + --with-harfbuzz=system \ + --with-jvm-features=zgc \ + --with-extra-cflags="${_CFLAGS}" \ + --with-extra-cxxflags="${_CXXFLAGS}" \ + --with-extra-ldflags="${_LDFLAGS}" # NOTE: for debugging build issues: set LOG to debug, JOBS to 1. LC_ALL=C \