summaryrefslogtreecommitdiff
path: root/experimental/openjdk7/icedtea-hotspot-noagent-musl.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-02-26 23:08:27 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-02-26 23:08:27 +0000
commite3a4ee5e107db0e37a99e7b50d976b0e938f5392 (patch)
treec96d33f0fb63ab0c2df3b2d8c6982950691ed17f /experimental/openjdk7/icedtea-hotspot-noagent-musl.patch
parent5ba732fc812b6ccc5a40d43a1a4fd9c769bc73e0 (diff)
downloadpackages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.gz
packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.bz2
packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.tar.xz
packages-e3a4ee5e107db0e37a99e7b50d976b0e938f5392.zip
experimental/openjdk7: new package (requires gawk)
Diffstat (limited to 'experimental/openjdk7/icedtea-hotspot-noagent-musl.patch')
-rw-r--r--experimental/openjdk7/icedtea-hotspot-noagent-musl.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/experimental/openjdk7/icedtea-hotspot-noagent-musl.patch b/experimental/openjdk7/icedtea-hotspot-noagent-musl.patch
new file mode 100644
index 000000000..37604acca
--- /dev/null
+++ b/experimental/openjdk7/icedtea-hotspot-noagent-musl.patch
@@ -0,0 +1,54 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make
++++ openjdk/hotspot/make/linux/makefiles/defs.make
+@@ -327,6 +327,9 @@
+
+ # Serviceability Binaries
+ # No SA Support for PPC, IA64, ARM or zero
++# or if thread_db.h missing (musl)
++
++ifneq ($(wildcard /usr/include/thread_db.h),)
+ ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+@@ -343,6 +346,10 @@
+ endif
+ endif
+ endif
++endif
++else
++ADD_SA_BINARIES/x86 =
++ADD_SA_BINARIES/sparc =
+ endif
+ ADD_SA_BINARIES/ppc =
+ ADD_SA_BINARIES/ppc64 =
+--- openjdk.orig/hotspot/make/linux/makefiles/sa.make
++++ openjdk/hotspot/make/linux/makefiles/sa.make
+@@ -59,9 +59,11 @@
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
++# check for thread_db.h too (musl does not have it).
+
+ all:
+- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
++ if [ -d $(AGENT_DIR) -a -f /usr/include/thread_db.h \
++ -a "$(SRCARCH)" != "ia64" \
+ -a "$(SRCARCH)" != "zero" \
+ -a "$(SRCARCH)" != "aarch64" ] ; then \
+ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
++++ openjdk/hotspot/make/linux/makefiles/saproc.make
+@@ -65,10 +65,13 @@
+
+ # if $(AGENT_DIR) does not exist, we don't build SA
+ # also, we don't build SA on Itanium or zero.
++# check for thread_db.h too (musl does not have it).
+
++ifneq ($(wildcard /usr/include/thread_db.h),)
+ ifneq ($(wildcard $(AGENT_DIR)),)
+ ifneq ($(filter-out ia64 zero aarch64,$(SRCARCH)),)
+ BUILDLIBSAPROC = $(LIBSAPROC)
++endif
+ endif
+ endif
+