diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-02-20 07:49:11 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-02-20 07:50:29 +0000 |
| commit | acdecf0f389384a5622583946f65d16e6ed45cec (patch) | |
| tree | 0f3b86b374d988169c59dc5a096642eae8b534ef /main/openjdk7/icedtea-hotspot-noagent-musl.patch | |
| parent | e86997cbcc2090b05cb4f07067e3789236b1ffb2 (diff) | |
| download | aports-acdecf0f389384a5622583946f65d16e6ed45cec.tar.bz2 aports-acdecf0f389384a5622583946f65d16e6ed45cec.tar.xz | |
main/openjdk7: new aport
Diffstat (limited to 'main/openjdk7/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | main/openjdk7/icedtea-hotspot-noagent-musl.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/main/openjdk7/icedtea-hotspot-noagent-musl.patch b/main/openjdk7/icedtea-hotspot-noagent-musl.patch new file mode 100644 index 0000000000..176b993118 --- /dev/null +++ b/main/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 +@@ -285,6 +285,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) \ +@@ -301,6 +304,10 @@ + endif + endif + endif ++endif ++else ++ADD_SA_BINARIES/x86 = ++ADD_SA_BINARIES/sparc = + endif + ADD_SA_BINARIES/ppc = + ADD_SA_BINARIES/ia64 = +--- 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" ] ; then \ + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ + fi +--- 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,$(SRCARCH)),) + BUILDLIBSAPROC = $(LIBSAPROC) ++endif + endif + endif + |