diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-07 14:02:48 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-07 14:03:23 +0000 |
| commit | 58a5aac536c752d7c0a69250dfeeebf5d9bceade (patch) | |
| tree | e5f62e6abe645ce302f6088e076b7b78a2a8d3dc /community/openjdk8/icedtea-hotspot-noagent-musl.patch | |
| parent | f9916072fe1c7a0e0e4526431839aa9032fe1a8f (diff) | |
| download | aports-58a5aac536c752d7c0a69250dfeeebf5d9bceade.tar.bz2 aports-58a5aac536c752d7c0a69250dfeeebf5d9bceade.tar.xz | |
community/openjdk8: moved from testing
Diffstat (limited to 'community/openjdk8/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | community/openjdk8/icedtea-hotspot-noagent-musl.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/community/openjdk8/icedtea-hotspot-noagent-musl.patch b/community/openjdk8/icedtea-hotspot-noagent-musl.patch new file mode 100644 index 0000000000..aa6c14ef05 --- /dev/null +++ b/community/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 + |