diff options
Diffstat (limited to 'main/openjdk6/icedtea-hotspot-noagent-musl.patch')
-rw-r--r-- | main/openjdk6/icedtea-hotspot-noagent-musl.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/main/openjdk6/icedtea-hotspot-noagent-musl.patch b/main/openjdk6/icedtea-hotspot-noagent-musl.patch deleted file mode 100644 index 0128241a96..0000000000 --- a/main/openjdk6/icedtea-hotspot-noagent-musl.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- openjdk.orig/hotspot/make/linux/makefiles/sa.make -+++ openjdk/hotspot/make/linux/makefiles/sa.make -@@ -59,9 +59,12 @@ - - # if $(AGENT_DIR) does not exist, we don't build SA - # also, we don't build SA on Itanium, PowerPC, ARM 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)" != "arm" \ - -a "$(SRCARCH)" != "ppc" \ - -a "$(SRCARCH)" != "zero" ] ; then \ ---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make -+++ openjdk/hotspot/make/linux/makefiles/saproc.make -@@ -54,10 +54,13 @@ - - # if $(AGENT_DIR) does not exist, we don't build SA - # also, we don't build SA on Itanium, PPC, ARM 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 arm ppc zero,$(SRCARCH)),) - BUILDLIBSAPROC = $(LIBSAPROC) -+endif - endif - endif - ---- openjdk.orig/hotspot/make/linux/makefiles/defs.make -+++ openjdk/hotspot/make/linux/makefiles/defs.make -@@ -144,10 +144,17 @@ - - # Serviceability Binaries - # No SA Support for PPC, IA64, ARM or zero --ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ -- $(EXPORT_LIB_DIR)/sa-jdi.jar --ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ -- $(EXPORT_LIB_DIR)/sa-jdi.jar -+# or if thread_db.h missing (musl) -+ -+ifneq ($(wildcard /usr/include/thread_db.h),) -+SA_BINARY_LIST = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ -+ $(EXPORT_LIB_DIR)/sa-jdi.jar -+else -+SA_BINARY_LIST = -+endif -+ -+ADD_SA_BINARIES/x86 = $(SA_BINARY_LIST) -+ADD_SA_BINARIES/sparc = $(SA_BINARY_LIST) - ADD_SA_BINARIES/ppc = - ADD_SA_BINARIES/ia64 = - ADD_SA_BINARIES/arm = |