summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch
new file mode 100644
index 0000000..4b0b0f0
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch
@@ -0,0 +1,51 @@
1From 19b1d6b4dc64a1c44a8f90776a489eee5c76463d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 15:12:08 +0000
4Subject: [PATCH] hotspot: disable agent build (pt2)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9the agent needs thread_db, which doesn't exist in musl
10
11Upstream-Status: Inappropriate [musl specific]
12Signed-off-by: André Draszik <andre.draszik@jci.com>
13---
14 common/autoconf/jdk-options.m4 | 2 +-
15 hotspot/make/linux/makefiles/saproc.make | 2 ++
16 2 files changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
19index a8f71705..036963ac 100644
20--- a/common/autoconf/jdk-options.m4
21+++ b/common/autoconf/jdk-options.m4
22@@ -151,7 +151,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
23 AC_SUBST(JVM_VARIANT_ZEROSHARK)
24 AC_SUBST(JVM_VARIANT_CORE)
25
26- INCLUDE_SA=true
27+ INCLUDE_SA=false
28 if test "x$JVM_VARIANT_ZERO" = xtrue ; then
29 INCLUDE_SA=false
30 fi
31diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make
32index 6579c8e1..8f29004c 100644
33--- a/hotspot/make/linux/makefiles/saproc.make
34+++ b/hotspot/make/linux/makefiles/saproc.make
35@@ -62,11 +62,13 @@ endif
36 # if $(AGENT_DIR) does not exist, we don't build SA
37 # also, we don't build SA on Itanium or zero.
38
39+ifeq (0,1)
40 ifneq ($(wildcard $(AGENT_DIR)),)
41 ifneq ($(filter-out ia64 zero,$(SRCARCH)),)
42 BUILDLIBSAPROC = $(LIBSAPROC)
43 endif
44 endif
45+endif
46
47 ifneq ($(ALT_SASRCDIR),)
48 ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR
49--
502.16.2
51