From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl
Date: Mon, 04 Nov 2019 18:43:40 +0100 [thread overview]
Message-ID: <20191104174340.zZvJpsFE4MrswqufNZuGwy_GETIyQzk0OcZ2Fl65Vgc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16101@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages openjdk11
https://github.com/void-linux/void-packages/pull/16101
openjdk11: add bootstrap path for x86_64-musl
Bootstrap binaries can just be cross compiled from glibc
`./xbps-src pkg openjdk11 -a x86_64-musl`. the tar ball just contains the `/usr/lib/jvm/openjdk11` directory.
https://void.johnnynator.dev/distfiles/
A patch file from https://github.com/void-linux/void-packages/pull/16101.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk11-16101.patch --]
[-- Type: text/x-diff, Size: 6201 bytes --]
From 0dd055c5acf0272ed8a4e996bc3d93ac5386d93c Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Mon, 4 Nov 2019 11:25:50 +0100
Subject: [PATCH] openjdk11: add bootstrap path for x86_64-musl
and fix alternatives and add /etc/profile.d entry
[ci skip]
---
srcpkgs/openjdk11/template | 50 +++++++++++++++++++-------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..e98ec420d95 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -8,7 +8,7 @@ _openjdk_version="openjdk-${_java_ver}"
pkgname=openjdk11
version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}+${_jdk_update}"
-revision=2
+revision=3
wrksrc="jdk${_java_ver}u-jdk-${version}"
build_style=gnu-configure
configure_args="
@@ -25,9 +25,7 @@ configure_args="
--with-vendor-name="Void"
--with-vendor-url="https://voidlinux.org/"
--with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
- --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"
- --with-boot-jdk=/usr/lib/jvm/openjdk11-bin"
-
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
make_build_args="images $(vopt_if docs docs)"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio unzip zip ca-certificates
@@ -55,65 +53,60 @@ esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" openjdk11"
configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
-else
+elif [ "$XBPS_ARCH" = "x86_64-musl" ]; then
+ hostmakedepends+=" libjpeg-turbo libXau libXdmcp libxcb libX11 libXext
+ libXrender libXtst libXi giflib libpng alsa-lib freetype lcms"
+ distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-x86_64-musl.tar.gz"
+ checksum+=" 037520d9eb077628e137d638f3084689610e8a2fbc9efe50e10823dbac7897a4"
+ configure_args+=" --with-boot-jdk=${XBPS_BUILDDIR}/${wrksrc}/openjdk11"
+elif [ "$XBPS_ARCH" = "x86_64" ]; then
hostmakedepends+=" openjdk11-bin"
configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11-bin"
+else
+ broken="No suitable bootstrap binary found"
fi
alternatives="
java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd
java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool
java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool
- java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv
java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
- jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk11/bin/appletviewer
- jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk11/bin/extcheck
- jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk11/bin/idlj
+ jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk11/bin/java-rmi.cgi
jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javah:/usr/lib/jvm/openjdk11/bin/javah
jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
+ jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk11/bin/jhat
+ jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
+ jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
+ jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
+ jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk11/bin/jsadebugd
+ jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk11/bin/native2ascii
- jdk:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd
jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool
jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk11/bin/schemagen
jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool
- jdk:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv
jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
- jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk11/bin/wsgen
- jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk11/bin/wsimport
- jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk11/bin/xjc
"
post_extract() {
@@ -121,6 +114,9 @@ post_extract() {
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
rm -r src/jdk.hotspot.agent
fi
+ if [ "$XBPS_ARCH" = "x86_64-musl" ]; then
+ mv ${wrksrc}/../openjdk11 ${wrksrc}/openjdk11
+ fi
}
post_patch() {
@@ -153,6 +149,10 @@ post_install() {
mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
chmod -R ugo+rw ./ca
rm -Rf ./ca
+ vmkdir etc/profile.d
+ cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
next prev parent reply other threads:[~2019-11-04 17:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 10:28 [PR PATCH] " voidlinux-github
2019-11-04 16:26 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-04 17:43 ` voidlinux-github [this message]
2019-11-05 12:17 ` voidlinux-github
2019-11-05 12:18 ` [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl and i686 voidlinux-github
2019-11-05 12:41 ` voidlinux-github
2019-11-05 14:56 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-05 17:15 ` voidlinux-github
2019-11-06 14:02 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191104174340.zZvJpsFE4MrswqufNZuGwy_GETIyQzk0OcZ2Fl65Vgc@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).