[PR PATCH] openjdk11: add bootstrap path for x86

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] openjdk11: add bootstrap path for x86_64-musl
@ 2019-11-04 10:28 voidlinux-github
  2019-11-04 16:26 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-04 10:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

There is a new 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: 2081 bytes --]

From 4059b91296dd71523ce75e885da5e1ad0efe536b 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

---
 srcpkgs/openjdk11/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..8d82c10155f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -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,9 +53,17 @@ 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="
@@ -121,6 +127,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() {

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
@ 2019-11-04 16:26 ` voidlinux-github
  2019-11-04 17:43 ` voidlinux-github
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-04 16:26 UTC (permalink / raw)
  To: ml

[-- 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: 6193 bytes --]

From 981c2c533b44e20f2cfc3ab8a25b72e147f2d226 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
---
 srcpkgs/openjdk11/template | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..605331338cd 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 >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
  2019-11-04 16:26 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-11-04 17:43 ` voidlinux-github
  2019-11-05 12:17 ` voidlinux-github
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-04 17:43 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
  2019-11-04 16:26 ` [PR PATCH] [Updated] " voidlinux-github
  2019-11-04 17:43 ` voidlinux-github
@ 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
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-05 12:17 UTC (permalink / raw)
  To: ml

[-- 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: 6540 bytes --]

From 225ea803e59e1c656c5fd5284234a97992ac0479 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 | 54 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..ce6771e2d09 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,64 @@ 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+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 037520d9eb077628e137d638f3084689610e8a2fbc9efe50e10823dbac7897a4"
+	configure_args+=" --with-boot-jdk=${XBPS_BUILDDIR}/${wrksrc}/openjdk11"
+elif [ "$XBPS_ARCH" = "i686" ]; then
+	hostmakedepends+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 90f4f43431487c2560c5be5f5fac979b6e0ff34933eaef1c1e37cd4b0e8cfb63"
+	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 +118,9 @@ post_extract() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		rm -r src/jdk.hotspot.agent
 	fi
+	if [ "$XBPS_ARCH" = "x86_64-musl" ] || [ "$XBPS_ARCH" = "i686" ]; then
+		mv ${wrksrc}/../openjdk11 ${wrksrc}/openjdk11
+	fi
 }
 
 post_patch() {
@@ -153,6 +153,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
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl and i686
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
                   ` (2 preceding siblings ...)
  2019-11-05 12:17 ` voidlinux-github
@ 2019-11-05 12:18 ` voidlinux-github
  2019-11-05 12:41 ` voidlinux-github
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-05 12:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 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 and i686
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: 6549 bytes --]

From 07c0153f567f17af85aa8080826e64fd9f702659 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 i686

and fix alternatives and add /etc/profile.d entry

[ci skip]
---
 srcpkgs/openjdk11/template | 54 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..ce6771e2d09 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,64 @@ 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+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 037520d9eb077628e137d638f3084689610e8a2fbc9efe50e10823dbac7897a4"
+	configure_args+=" --with-boot-jdk=${XBPS_BUILDDIR}/${wrksrc}/openjdk11"
+elif [ "$XBPS_ARCH" = "i686" ]; then
+	hostmakedepends+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 90f4f43431487c2560c5be5f5fac979b6e0ff34933eaef1c1e37cd4b0e8cfb63"
+	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 +118,9 @@ post_extract() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		rm -r src/jdk.hotspot.agent
 	fi
+	if [ "$XBPS_ARCH" = "x86_64-musl" ] || [ "$XBPS_ARCH" = "i686" ]; then
+		mv ${wrksrc}/../openjdk11 ${wrksrc}/openjdk11
+	fi
 }
 
 post_patch() {
@@ -153,6 +153,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
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: openjdk11: add bootstrap path for x86_64-musl and i686
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
                   ` (3 preceding siblings ...)
  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
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-05 12:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/16101#issuecomment-549806742

Comment:
@void-linux/pkg-committers Any feedback on having `i686` and `x86_64-musl` bootstrapped this way for now? This would finally provide us with a java on every (primary) architecture we support.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] openjdk11: add bootstrap path for x86_64-musl and i686
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
                   ` (4 preceding siblings ...)
  2019-11-05 12:41 ` voidlinux-github
@ 2019-11-05 14:56 ` voidlinux-github
  2019-11-05 17:15 ` voidlinux-github
  2019-11-06 14:02 ` [PR PATCH] [Merged]: " voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-05 14:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 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 and i686
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: 6589 bytes --]

From c9ae0c0c928bd1164c8c9abc23764031ba4c17a3 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 i686

and fix alternatives and add /etc/profile.d entry

[ci skip]
---
 srcpkgs/openjdk11/template | 56 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a13c7e492d7..3a0174da725 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,64 @@ 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+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 037520d9eb077628e137d638f3084689610e8a2fbc9efe50e10823dbac7897a4"
+	configure_args+=" --with-boot-jdk=${XBPS_BUILDDIR}/${wrksrc}/openjdk11"
+elif [ "$XBPS_ARCH" = "i686" ]; then
+	hostmakedepends+=" alsa-lib freetype giflib lcms libXi libXrender libXtst"
+	distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-${XBPS_ARCH}.tar.gz"
+	checksum+=" 90f4f43431487c2560c5be5f5fac979b6e0ff34933eaef1c1e37cd4b0e8cfb63"
+	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 +118,11 @@ post_extract() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		rm -r src/jdk.hotspot.agent
 	fi
+	if [ -z $CROSS_BUILD ]; then
+		if [ "$XBPS_ARCH" = "x86_64-musl" ] || [ "$XBPS_ARCH" = "i686" ]; then
+			mv ${wrksrc}/../openjdk11 ${wrksrc}/openjdk11
+		fi
+	fi
 }
 
 post_patch() {
@@ -153,6 +155,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
 }

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: openjdk11: add bootstrap path for x86_64-musl and i686
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
                   ` (5 preceding siblings ...)
  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
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-05 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/16101#issuecomment-549919939

Comment:
sounds good to me.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: openjdk11: add bootstrap path for x86_64-musl and i686
  2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
                   ` (6 preceding siblings ...)
  2019-11-05 17:15 ` voidlinux-github
@ 2019-11-06 14:02 ` voidlinux-github
  7 siblings, 0 replies; 9+ messages in thread
From: voidlinux-github @ 2019-11-06 14:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

There's a merged pull request on the void-packages repository

openjdk11: add bootstrap path for x86_64-musl and i686
https://github.com/void-linux/void-packages/pull/16101

Description:
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/

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-11-06 14:02 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-04 10:28 [PR PATCH] openjdk11: add bootstrap path for x86_64-musl voidlinux-github
2019-11-04 16:26 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-04 17:43 ` voidlinux-github
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

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).