diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-06 11:01:53 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-06 11:03:09 +0200 |
commit | 3668ba76f44bc778ba4446236088c22948a644d0 (patch) | |
tree | cc3291774f0e41350f22a1e5e0196e08f14500a3 /recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch | |
parent | f8be3065f7c5dbd73516394c0bcd2c7ba1777abf (diff) | |
download | meta-java-3668ba76f44bc778ba4446236088c22948a644d0.tar.gz |
openjdk-8: fix musl build
Add various patches to make it work in musl. Some of them are generic
enough to be applied for all builds, some need to be specific to musl.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch new file mode 100644 index 0000000..8ad000d --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 4429d73853b3938a53a6058cc0dcaac08d191995 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
3 | Date: Tue, 27 Feb 2018 16:01:54 +0000 | ||
4 | Subject: [PATCH 3/9] jdk: fix libjvm load on musl (set LD_LIBRARY_PATH) | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | musl needs LD_LIBRARY_PATH set because when .so is opened | ||
10 | with dlopen(/abs/path) it does not qualify for providing | ||
11 | symbols for NEEDED dependency. | ||
12 | |||
13 | Patch taken from Alpine Linux: | ||
14 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-fix-libjvm-load.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | ||
15 | |||
16 | Upstream-Status: Inappropriate [musl specific] | ||
17 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
18 | --- | ||
19 | jdk/src/solaris/bin/java_md_solinux.c | 2 ++ | ||
20 | 1 file changed, 2 insertions(+) | ||
21 | |||
22 | diff --git a/jdk/src/solaris/bin/java_md_solinux.c b/jdk/src/solaris/bin/java_md_solinux.c | ||
23 | index 6d977109..e9a0a1eb 100644 | ||
24 | --- a/jdk/src/solaris/bin/java_md_solinux.c | ||
25 | +++ b/jdk/src/solaris/bin/java_md_solinux.c | ||
26 | @@ -291,6 +291,8 @@ RequiresSetenv(int wanted, const char *jvmpath) { | ||
27 | char *dmllp = NULL; | ||
28 | char *p; /* a utility pointer */ | ||
29 | |||
30 | + return JNI_TRUE; | ||
31 | + | ||
32 | #ifdef AIX | ||
33 | /* We always have to set the LIBPATH on AIX because ld doesn't support $ORIGIN. */ | ||
34 | return JNI_TRUE; | ||
35 | -- | ||
36 | 2.16.2 | ||
37 | |||