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-0005-hotspot-disable-agent-build.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-0005-hotspot-disable-agent-build.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch new file mode 100644 index 0000000..913b318 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d 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 15:12:08 +0000 | ||
4 | Subject: [PATCH 5/9] hotspot: disable agent build | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | the agent needs thread_db, which doesn't exist in musl | ||
10 | |||
11 | Upstream-Status: Inappropriate [musl specific] | ||
12 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
13 | --- | ||
14 | common/autoconf/jdk-options.m4 | 2 +- | ||
15 | hotspot/make/linux/makefiles/defs.make | 4 ++++ | ||
16 | hotspot/make/linux/makefiles/sa.make | 2 +- | ||
17 | hotspot/make/linux/makefiles/saproc.make | 2 ++ | ||
18 | 4 files changed, 8 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 | ||
21 | index a8f71705..036963ac 100644 | ||
22 | --- a/common/autoconf/jdk-options.m4 | ||
23 | +++ b/common/autoconf/jdk-options.m4 | ||
24 | @@ -151,7 +151,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], | ||
25 | AC_SUBST(JVM_VARIANT_ZEROSHARK) | ||
26 | AC_SUBST(JVM_VARIANT_CORE) | ||
27 | |||
28 | - INCLUDE_SA=true | ||
29 | + INCLUDE_SA=false | ||
30 | if test "x$JVM_VARIANT_ZERO" = xtrue ; then | ||
31 | INCLUDE_SA=false | ||
32 | fi | ||
33 | diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make | ||
34 | index 3af5878a..d10bab95 100644 | ||
35 | --- a/hotspot/make/linux/makefiles/defs.make | ||
36 | +++ b/hotspot/make/linux/makefiles/defs.make | ||
37 | @@ -286,6 +286,7 @@ ifeq ($(JVM_VARIANT_MINIMAL1),true) | ||
38 | endif | ||
39 | endif | ||
40 | |||
41 | +ifeq (0,1) | ||
42 | # Serviceability Binaries | ||
43 | # No SA Support for PPC, IA64, ARM or zero | ||
44 | ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ | ||
45 | @@ -305,6 +306,9 @@ ADD_SA_BINARIES/ppc = | ||
46 | ADD_SA_BINARIES/ia64 = | ||
47 | ADD_SA_BINARIES/arm = | ||
48 | ADD_SA_BINARIES/zero = | ||
49 | +else | ||
50 | +ADD_SA_BINARIES/$(HS_ARCH) = | ||
51 | +endif | ||
52 | |||
53 | -include $(HS_ALT_MAKE)/linux/makefiles/defs.make | ||
54 | |||
55 | diff --git a/hotspot/make/linux/makefiles/sa.make b/hotspot/make/linux/makefiles/sa.make | ||
56 | index 66a7b945..61cc7244 100644 | ||
57 | --- a/hotspot/make/linux/makefiles/sa.make | ||
58 | +++ b/hotspot/make/linux/makefiles/sa.make | ||
59 | @@ -62,7 +62,7 @@ SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties | ||
60 | |||
61 | all: | ||
62 | if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \ | ||
63 | - -a "$(SRCARCH)" != "zero" ] ; then \ | ||
64 | + -a "$(SRCARCH)" != "zero" ] && [ 0 -eq 1 ] ; then \ | ||
65 | $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | ||
66 | fi | ||
67 | |||
68 | diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make | ||
69 | index 6579c8e1..8f29004c 100644 | ||
70 | --- a/hotspot/make/linux/makefiles/saproc.make | ||
71 | +++ b/hotspot/make/linux/makefiles/saproc.make | ||
72 | @@ -62,11 +62,13 @@ endif | ||
73 | # if $(AGENT_DIR) does not exist, we don't build SA | ||
74 | # also, we don't build SA on Itanium or zero. | ||
75 | |||
76 | +ifeq (0,1) | ||
77 | ifneq ($(wildcard $(AGENT_DIR)),) | ||
78 | ifneq ($(filter-out ia64 zero,$(SRCARCH)),) | ||
79 | BUILDLIBSAPROC = $(LIBSAPROC) | ||
80 | endif | ||
81 | endif | ||
82 | +endif | ||
83 | |||
84 | ifneq ($(ALT_SASRCDIR),) | ||
85 | ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR | ||
86 | -- | ||
87 | 2.16.2 | ||
88 | |||