moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

mandrel: update to 22.1.0.0.

Browse source
This commit is contained in:
Leah Neukirchen 2022-06-15 14:57:47 +02:00
parent 52f8c8a557
commit 6d42da57f5
2 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,37 +2,28 @@ 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.orig
+++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java +++ substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
@@ -43,13 +43,12 @@ @@ -41,5 +41,4 @@
@Override @Override
public List<String> getAdditionalQueryCodeCompilerOptions() { public List<String> getAdditionalQueryCodeCompilerOptions() {
- /* Avoid the dependency to muslc for builds cross compiling to muslc. */ - /* Avoid the dependency to muslc for builds cross compiling to muslc. */
return Collections.singletonList("--static"); - return Collections.singletonList("--static");
+ return Collections.emptyList();
} }
@@ -58,13 +52,6 @@
@Override
public String getTargetCompiler() {
- return "x86_64-linux-musl-gcc";
+ return "gcc";
}
@Override
@@ -59,14 +58,11 @@
@Override @Override
public boolean requiresLibCSpecificStaticJDKLibraries() { public boolean requiresLibCSpecificStaticJDKLibraries() {
- return true; - return true;
+ return false; - }
} -
- @Override
@Override - public void checkIfLibCSupported() {
public void checkIfLibCSupported() {
- if (!SubstrateOptions.StaticExecutable.getValue()) { - if (!SubstrateOptions.StaticExecutable.getValue()) {
- throw UserError.abort("Musl can only be used for statically linked executables."); - throw UserError.abort("Musl can only be used for statically linked executables.");
- } - }
if (JavaVersionUtil.JAVA_SPEC < 11) { + return false;
throw UserError.abort("Musl can only be used with labsjdk 11+."); }
} }
--- substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c.orig --- substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c.orig
+++ substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c +++ substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@

14
srcpkgs/mandrel/template
View file

@ -1,14 +1,14 @@
# Template file for 'mandrel' # Template file for 'mandrel'
pkgname=mandrel pkgname=mandrel
version=21.3.1.0 version=22.1.0.0
revision=1 revision=1
_java_ver=11 _java_ver=11
_mx_ver=5.309.2 _mx_ver=6.1.2
archs="aarch64* x86_64*" # upstream supported archs archs="aarch64* x86_64*" # upstream supported archs
wrksrc="mandrel-${version}" wrksrc="mandrel-${version}"
create_wrksrc=yes create_wrksrc=yes
hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-src hostmakedepends="openjdk${_java_ver} openjdk${_java_ver}-jmods
openjdk${_java_ver}-static-libs python3" openjdk${_java_ver}-src openjdk${_java_ver}-static-libs python3"
makedepends="zlib-devel" makedepends="zlib-devel"
short_desc="Downstream distribution of the GraalVM community edition" short_desc="Downstream distribution of the GraalVM community edition"
maintainer="Leah Neukirchen <leah@vuxu.org>" maintainer="Leah Neukirchen <leah@vuxu.org>"
@ -17,9 +17,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 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/mandrel/archive/refs/tags/mandrel-${version}-Final.tar.gz
https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz" https://github.com/graalvm/mx/archive/refs/tags/${_mx_ver}.tar.gz"
checksum="a92bf8d88f6496c1455c9b355fff95fca2fddd2710a558dd2618fe9857bcad01 checksum="a93ef67c75c52ff90faba95236100c4f702df2de87593b9bb00da3a2cbec3a23
7dec53ea2c36491896bc388bc60ca804abc5c26b0d4697d930a45cb5c9884469 8cf3aefe5f9aa7869ddaf02376be5febc20831461ce524c912f3f22fbf922863
fcb980a4980ff5f391fad050c493dc6cd045356a12912d833d3041fe54e62a56" ae7a7d2a195666e32126f51dad5b55abbc204a13e89582172cc461a29ae84205"
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
nocross=yes nocross=yes