From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openjdk17: static-libs subpackage
Date: Thu, 16 Mar 2023 01:41:27 +0100 [thread overview]
Message-ID: <20230316004127.wcMCUOGGdki1ejLU1eO4c0wMncw0t2tVwCq6HrJjud0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42526@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages openjdk17-static
https://github.com/void-linux/void-packages/pull/42526
openjdk17: static-libs subpackage
- openjdk11: remove useless nostrep from -static-libs
- openjdk17: static libs subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/42526.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk17-static-42526.patch --]
[-- Type: text/x-diff, Size: 6108 bytes --]
From f0e3fb2eb3217f29bc45b1f6792448dd4222ae20 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 1 Mar 2023 11:12:36 -0500
Subject: [PATCH 1/3] openjdk11: remove useless nostrep from -static-libs
it wasn't doing anything anyways, it was "notstrip"
also fix distfile source, update check
---
srcpkgs/openjdk11/template | 5 ++---
srcpkgs/openjdk11/update | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 173aac14b5d5..e0d7ba7fb632 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -36,8 +36,8 @@ short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
-distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
+distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
+checksum=9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec
provides="java-environment-${version}_1"
# Build is still parallel, but don't use -jN.
@@ -212,7 +212,6 @@ openjdk11-src_package() {
}
openjdk11-static-libs_package() {
- notstrip=yes
short_desc+=" - static libs"
pkg_install() {
vmkdir $_jdk_home
diff --git a/srcpkgs/openjdk11/update b/srcpkgs/openjdk11/update
index a4ed7b4e4ea8..fbdc9a1ba62f 100644
--- a/srcpkgs/openjdk11/update
+++ b/srcpkgs/openjdk11/update
@@ -1,2 +1 @@
-site="http://hg.openjdk.java.net/jdk-updates/jdk11u/tags"
-pattern='jdk-\K11\.[\d.+]+'
+pattern='jdk-\K11\.[\d.+]+(?=\.)'
From fc506ecc341bb4e57e437f41bfa628303d654c1b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 1 Mar 2023 11:13:09 -0500
Subject: [PATCH 2/3] openjdk17: static libs subpackage
---
srcpkgs/openjdk17-static-libs | 1 +
srcpkgs/openjdk17/template | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/openjdk17-static-libs
diff --git a/srcpkgs/openjdk17-static-libs b/srcpkgs/openjdk17-static-libs
new file mode 120000
index 000000000000..99ab1cb1b0d2
--- /dev/null
+++ b/srcpkgs/openjdk17-static-libs
@@ -0,0 +1 @@
+openjdk17
\ No newline at end of file
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index e4b6a8a3b5bb..b80abe43727a 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors
--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"
-make_build_args="images $(vopt_if docs docs)"
+make_build_args="images static-libs-image $(vopt_if docs docs)"
make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -159,6 +159,7 @@ do_configure() {
post_install() {
rm -rf ${DESTDIR}/usr/lib/bin
mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home
+ vcopy build/*-release/images/static-libs/lib $_jdk_home
vmkdir $_jdk_home/lib/security
make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool"
mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/
@@ -166,7 +167,7 @@ post_install() {
rm -rf ./ca
}
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
+subpackages="openjdk17-static-libs openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
openjdk17-jre_package() {
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -219,6 +220,13 @@ openjdk17-src_package() {
}
}
+openjdk17-static-libs_package() {
+ short_desc+=" - static libs"
+ pkg_install() {
+ vmove "$_jdk_home/lib/*.a"
+ }
+}
+
openjdk17-jmods_package() {
short_desc+=" - JMODs"
depends="${pkgname}-${version}_${revision}"
From 2fcc792d4ef212a95d96fa92aa7be8a9e864bb37 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Dec 2022 21:01:10 +0530
Subject: [PATCH 3/3] mandrel: update to 22.3.1.0.
---
srcpkgs/mandrel/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index a0b0701df206..503d264c2394 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -1,11 +1,10 @@
# Template file for 'mandrel'
pkgname=mandrel
-version=22.1.0.0
+version=22.3.1.0
revision=1
-_java_ver=11
-_mx_ver=6.1.2
+_java_ver=17
+_mx_ver=6.16.0
archs="aarch64* x86_64*" # upstream supported archs
-create_wrksrc=yes
hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
makedepends="zlib-devel"
@@ -16,9 +15,9 @@ homepage="https://github.com/graalvm/mandrel"
distfiles="https://github.com/graalvm/mandrel-packaging/archive/refs/tags/mandrel-${version}-Final.tar.gz>packaging-${version}.tar.gz
https://github.com/graalvm/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
-checksum="a93ef67c75c52ff90faba95236100c4f702df2de87593b9bb00da3a2cbec3a23
- 8cf3aefe5f9aa7869ddaf02376be5febc20831461ce524c912f3f22fbf922863
- ae7a7d2a195666e32126f51dad5b55abbc204a13e89582172cc461a29ae84205"
+checksum="dd37f4a8f628b8909228f489e12363427df9d0f95d1afedad39a2443b22a806d
+ bfe15128e8ffb5fd108ee20477e5ee1572c63405d6d0b93d905185356128dcec
+ aeec921e0669c72575dd9af54b5d5413d744dac590c82db46ae2bf60c4dfeb1b"
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
nocross=yes
@@ -32,6 +31,7 @@ post_patch() {
do_build() {
cd mandrel-packaging-*
+ export PATH=/usr/libexec/chroot-git:$PATH
export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}
$JAVA_HOME/bin/java -ea build.java \
--mx-home $PWD/../mx-* \
next prev parent reply other threads:[~2023-03-16 0:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-01 16:14 [PR PATCH] " classabbyamp
2023-03-01 17:08 ` icp1994
2023-03-01 18:54 ` classabbyamp
2023-03-01 22:21 ` [PR PATCH] [Updated] " classabbyamp
2023-03-01 23:19 ` classabbyamp
2023-03-05 7:25 ` classabbyamp
2023-03-05 8:26 ` icp1994
2023-03-05 8:28 ` icp1994
2023-03-05 8:30 ` [PR PATCH] [Updated] " classabbyamp
2023-03-05 8:31 ` classabbyamp
2023-03-05 8:32 ` classabbyamp
2023-03-06 18:48 ` classabbyamp
2023-03-16 0:41 ` classabbyamp [this message]
2023-03-16 0:51 ` [PR PATCH] [Updated] " classabbyamp
2023-03-16 6:06 ` [PR PATCH] [Merged]: " classabbyamp
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=20230316004127.wcMCUOGGdki1ejLU1eO4c0wMncw0t2tVwCq6HrJjud0@z \
--to=classabbyamp@users.noreply.github.com \
--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).