diff options
| author |   Eric Hameleers <alien@slackware.com> | 2022-08-09 15:04:24 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2022-08-09 15:04:24 +0000 |
| commit | 938a15ed83210c0812c5df2087cca756deda2f6d (patch) | |
| tree | c5c17f54bccb42f96ddbd686f5b90d333bd88905 | |
| parent | 1a4a9fe567c96c7c6402484b0de4c8127bd26ced (diff) | |
| download | asb-938a15ed83210c0812c5df2087cca756deda2f6d.tar.gz asb-938a15ed83210c0812c5df2087cca756deda2f6d.tar.xz | |
openjdk11: some optimizations that make 'java -version' show nicer-looking output, and make openjdk11.SlackBuild run until the end on 32bit .
| -rwxr-xr-x | openjdk11/build/openjdk11.SlackBuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openjdk11/build/openjdk11.SlackBuild b/openjdk11/build/openjdk11.SlackBuild index 3bdf9a84..c10fe844 100755 --- a/openjdk11/build/openjdk11.SlackBuild +++ b/openjdk11/build/openjdk11.SlackBuild @@ -213,6 +213,8 @@ sh configure \ --with-vendor-bug-url="https://alien.slackbook.org/blog/wp-admin/edit.php?tag=openjdk" \ --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" \ --with-version-build="${UPDVER}" \ + --with-version-opt="" \ + --with-version-pre="" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ @@ -242,7 +244,7 @@ make bootcycle-images 2>&1 | tee $OUTPUT/make-${PRGNAM}.log # Manually install the generated jdk image into the package directory: mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/java -cp -a build/linux*/images/jdk/* $PKG/usr/lib${LIBDIRSUFFIX}/java/ +cp -a build/linux*release/images/jdk/* $PKG/usr/lib${LIBDIRSUFFIX}/java/ # We do not need the demo materials: rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/java/demo @@ -285,7 +287,7 @@ if which keytool 1>/dev/null 2>&1 ; then done perl generate-cacerts.pl keytool all.crt install -p -m0644 cacerts $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/security - ) + ) || true else echo "** Not installing a fresh cacerts file !" echo "** Missing keytool program (do you really have a Java installed?)" |