diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-08-17 20:08:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-18 11:16:36 +0200 |
| commit | 166ad0377b8e939f7777c85b4a791ae53969a42b (patch) | |
| tree | 4f5c7386e463f17115f62bceb25e8d3bd9f84ef7 /testing/openjdk8/icedtea-hotspot-noagent-musl.patch | |
| parent | 33696ff4c4f593b5c06bafac16d6206c4c591eea (diff) | |
testing/openjdk8: new aport
ref #4515
openjdk8 and openjdk7 cannot coexist currently due to automatic
so dependencies. both packages should be fixed to not provide
conflicting so deps (or maybe needs abuild change?)
Diffstat (limited to 'testing/openjdk8/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | testing/openjdk8/icedtea-hotspot-noagent-musl.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/testing/openjdk8/icedtea-hotspot-noagent-musl.patch b/testing/openjdk8/icedtea-hotspot-noagent-musl.patch new file mode 100644 index 00000000000..aa6c14ef053 --- /dev/null +++ b/testing/openjdk8/icedtea-hotspot-noagent-musl.patch @@ -0,0 +1,51 @@ +--- src/hotspot.orig/make/linux/makefiles/defs.make ++++ src/hotspot/make/linux/makefiles/defs.make +@@ -292,6 +292,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) \ +@@ -304,6 +307,10 @@ + ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + endif ++endif ++else ++ADD_SA_BINARIES/x86 = ++ADD_SA_BINARIES/sparc = + endif + ADD_SA_BINARIES/ppc = + ADD_SA_BINARIES/ia64 = +--- src/hotspot.orig/make/linux/makefiles/sa.make ++++ src/hotspot/make/linux/makefiles/sa.make +@@ -61,7 +61,8 @@ + # also, we don't build SA on Itanium or zero. + + 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 +--- src/hotspot.orig/make/linux/makefiles/saproc.make ++++ src/hotspot/make/linux/makefiles/saproc.make +@@ -61,10 +61,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 + |