wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-19 07:37:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mandrel: update to 23.0.1.2.

Browse source
This commit is contained in:
icp 2023-07-15 22:45:28 +05:30 • committed by Leah Neukirchen
parent d6b26e08b3
commit 9589b5d5e1
2 changed files with 7 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
srcpkgs/mandrel/files/musl.patch
View file

@ -1,48 +0,0 @@
Make musl a native libc.
--- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java.orig
+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
@@ -41,5 +41,4 @@
@Override
public List<String> getAdditionalQueryCodeCompilerOptions() {
- /* Avoid the dependency to muslc for builds cross compiling to muslc. */
- return Collections.singletonList("--static");
+ return Collections.emptyList();
}
@@ -58,13 +52,6 @@
@Override
public boolean requiresLibCSpecificStaticJDKLibraries() {
- return true;
- }
-
- @Override
- public void checkIfLibCSupported() {
- if (!SubstrateOptions.StaticExecutable.getValue()) {
- throw UserError.abort("Musl can only be used for statically linked executables.");
- }
+ return false;
}
}
--- substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c.orig
+++ substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
@@ -128,7 +128,7 @@
return listen(fd, count);
}
-JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, uint flags) {
+JNIEXPORT int JNICALL JVM_Send(int fd, char* buf, size_t nBytes, unsigned int flags) {
RESTARTABLE_RETURN_INT(send(fd, buf, nBytes, flags));
}
--- substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java.orig
+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/LibCFeature.java
@@ -55,7 +55,7 @@
@Override
public String getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
if (!values.containsKey(this)) {
- return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "glibc";
+ return Platform.includedIn(Platform.ANDROID.class) ? "bionic" : "musl";
}
return (String) values.get(this);
}

19
srcpkgs/mandrel/template
View file

@ -1,9 +1,9 @@
# Template file for 'mandrel'
pkgname=mandrel
version=22.3.2.1
version=23.0.1.2
revision=1
_java_ver=17
_mx_ver=6.20.3
_mx_ver=6.35.1
archs="aarch64* x86_64*" # upstream supported archs
hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
@ -15,19 +15,14 @@ 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="b109a1204ace963ec94523d1c2b5bffd2fa68aef8a79e2d650629324e911a890
4aab85f02bed302b763c036c1a3f392d974b0b4d4ddf22e297c3246744e16455
b2d86d0169a790afdb7ec83e47ffd46ef8bdad5c37f6a635423624a4ee0c9c54"
checksum="db8fdb0a0cf3c80226f301982e437c4a63cc7486f292784804475be1b5d5c900
745c4cedead5d43a09d9b2a05be50e95df53c1923a5969d68f02b0d5a3f7fa55
9580168c4fe32dd70609b22670c633cb4c5f25826841083f4e9cdd5d8fe7e59d"
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
nocross=yes
post_patch() {
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# XXX: only static builds with native-image work
# (else TEXTREL issues)
patch --no-backup-if-mismatch -d mandrel-mandrel-* -p0 < ${FILESDIR}/musl.patch
fi
}
# XXX: only static builds with native-image work
# (else TEXTREL issues)
do_build() {
cd mandrel-packaging-*