commit 18cae229e1e7c16ce507a3b1b3984eaecdcb1baa Author: Tim Biermann <tbier@posteo.de> Date: Sun Nov 14 17:06:03 2021 +0100 [notify] openjdk17-jdk: removed dependency: krb5; added dependency: harfbuzz diff --git a/openjdk17-jdk/.signature b/openjdk17-jdk/.signature index 1c271829e..f9ecdf403 100644 --- a/openjdk17-jdk/.signature +++ b/openjdk17-jdk/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31NwRxxilrIpgBVPJZDz0XU9bSoEyoNmFhhxhb1FDEuA9xFGqwt+8KermxjgLxFmHJuvQPSs2eDZCCoajxqbZg4= -SHA256 (Pkgfile) = 160f5908d245e74c48c2854fd29a5d02b4f182a856900b3456defbd35bdd9836 +RWSagIOpLGJF3zJkGw+xyew7X1qxBbTlkIobv396TwUFio2s1tOgDkoxEZbYiCLNsUx2SxRFy34Kul96jM+08HTPXGNCPHK1fQc= +SHA256 (Pkgfile) = 2a163a41d6db5e3b489504881fad2f49c03ed7fe3a1edb4d1996ab7af88f9bba SHA256 (.footprint) = db318dbd71aca4dc8b99db2242996ddd884adfd7e86c1025378ee1119c039f1c SHA256 (openjdk17-jdk-17.0.1+12.tar.gz) = 8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1 SHA256 (openjdk17-boot-20211106.tar.xz) = 4c5b27da49f05bbf19223322213c4f430557c64c400a8fe6cb5b9b07e47780c6 diff --git a/openjdk17-jdk/Pkgfile b/openjdk17-jdk/Pkgfile index 7f88e7002..6436e92a4 100644 --- a/openjdk17-jdk/Pkgfile +++ b/openjdk17-jdk/Pkgfile @@ -2,7 +2,7 @@ # URL: https://openjdk.java.net/ # Maintainer: Tim Biermann, tbier at posteo dot de # Co-Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip +# Depends on: alsa-lib cups giflib harfbuzz lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip name=openjdk17-jdk version=17.0.1+12 @@ -58,6 +58,8 @@ build() { --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ + --with-freetype=system \ + --with-harfbuzz=system \ --with-extra-cflags="$_CFLAGS" \ --with-extra-cxxflags="$_CXXFLAGS" diff --git a/openjdk17-jdk/Pkgfile.orig b/openjdk17-jdk/Pkgfile.orig new file mode 100644 index 000000000..c7aa4237d --- /dev/null +++ b/openjdk17-jdk/Pkgfile.orig @@ -0,0 +1,83 @@ +# Description: OpenJDK 17 Java Development Kit +# URL: https://openjdk.java.net/ +# Maintainer: Tim Biermann, tbier at posteo dot de +# Co-Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: alsa-lib cups fontconfig freetype harfbuzz giflib lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip + +name=openjdk17-jdk +version=17.0.1+12 +_boot_ver=20211106 +_cert_ver=20210916 +release=1 +source=(https://github.com/openjdk/jdk17u/archive/jdk-$version/$name-$version.tar.gz + https://crux.ster.zone/downloads/java/openjdk17-boot-$_boot_ver.tar.xz + https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver}) + +build() { + if [ -e '/usr/bin/ccache' ]; then + PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') + PKGMK_JDK17+=' --enable-ccache' + fi + + OLD_PATH=$PATH + export JAVA_HOME=$SRC/openjdk17-boot + export PATH=$JAVA_HOME/bin:$OLD_PATH + + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + export _CFLAGS+=' -fcommon' + export _CXXFLAGS+=' -fcommon' + + [ -z $JOBS ] && JOBS=$(nproc) + + mkdir $SRC/build + cd $SRC/build + + LC_ALL=C + /bin/bash ../jdk17u-jdk-${version/+/-}/configure $PKGMK_JDK17 \ + --prefix=/usr/lib/java/$name \ + --disable-precompiled-headers \ + --disable-warnings-as-errors \ + --enable-dtrace=no \ + --enable-unlimited-crypto \ + --with-native-debug-symbols=internal \ + --with-debug-level=release \ + --with-stdc++lib=dynamic \ + --with-jvm-variants=server \ + --with-cacerts-file=$SRC/java_cacerts-$_cert_ver \ + --with-jtreg=no \ + --with-boot-jdk=$JAVA_HOME \ + --with-version-opt="CRUX-r$release" \ + --with-version-build="${version#*+}" \ + --with-vendor-name="CRUX" \ + --with-jobs=$JOBS \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-libpng=system \ + --with-zlib=system \ + --with-lcms=system \ + --with-freetype=system \ + --with-harfbuzz=system \ + --with-extra-cflags="$_CFLAGS" \ + --with-extra-cxxflags="$_CXXFLAGS" + + # NOTE: for debugging build issues: set LOG to debug, JOBS to 1. + LC_ALL=C \ + make LOG=warn JOBS=$JOBS jdk-image + + rm -r images/jdk/demo + rm -r images/jdk/lib/src.zip + rm -r images/jdk/lib/*.ja + rm -r images/jdk/legal + rm images/jdk/conf/security/policy/README.txt + + install -d -m 0755 $PKG/usr/lib/java/$name + cp -r images/jdk/* $PKG/usr/lib/java/$name/ + + install -d -m 0755 $PKG/etc/revdep.d + echo "/usr/lib/java/$name/lib" > $PKG/etc/revdep.d/$name + echo "/usr/lib/java/$name/lib/jli" >> $PKG/etc/revdep.d/$name + echo "/usr/lib/java/$name/lib/server" >> $PKG/etc/revdep.d/$name +}