diff options
Diffstat (limited to 'community/openjdk8/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | community/openjdk8/icedtea-hotspot-noagent-musl.patch | 62 |
1 files changed, 45 insertions, 17 deletions
diff --git a/community/openjdk8/icedtea-hotspot-noagent-musl.patch b/community/openjdk8/icedtea-hotspot-noagent-musl.patch index aa6c14ef05..67dbae3cb2 100644 --- a/community/openjdk8/icedtea-hotspot-noagent-musl.patch +++ b/community/openjdk8/icedtea-hotspot-noagent-musl.patch @@ -1,6 +1,28 @@ ---- src/hotspot.orig/make/linux/makefiles/defs.make -+++ src/hotspot/make/linux/makefiles/defs.make -@@ -292,6 +292,9 @@ +--- openjdk.orig/common/autoconf/configure ++++ openjdk/common/autoconf/configure +@@ -96,7 +96,7 @@ + } + + # Check for local changes +-check_hg_updates ++run_autogen_or_fail + + if test -e $conf_custom_script_dir/generated-configure.sh; then + # Test if open configure is newer than custom configure, if so, custom needs to +--- openjdk.orig/common/autoconf/jdk-options.m4 ++++ openjdk/common/autoconf/jdk-options.m4 +@@ -151,7 +151,7 @@ + AC_SUBST(JVM_VARIANT_ZEROSHARK) + AC_SUBST(JVM_VARIANT_CORE) + +- INCLUDE_SA=true ++ AC_CHECK_HEADER(thread_db.h,INCLUDE_SA=true,INCLUDE_SA=false) + if test "x$JVM_VARIANT_ZERO" = xtrue ; then + INCLUDE_SA=false + fi +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make ++++ openjdk/hotspot/make/linux/makefiles/defs.make +@@ -309,6 +309,9 @@ # Serviceability Binaries # No SA Support for PPC, IA64, ARM or zero @@ -10,21 +32,25 @@ 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 +@@ -326,6 +329,11 @@ endif -+endif -+else -+ADD_SA_BINARIES/x86 = -+ADD_SA_BINARIES/sparc = endif + endif ++else ++ADD_SA_BINARIES/x86 = ++ADD_SA_BINARIES/sparc = ++ADD_SA_BINARIES/aarch64 = ++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 @@ + ADD_SA_BINARIES/arm = +--- 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" \ @@ -33,9 +59,9 @@ -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 @@ +--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make ++++ openjdk/hotspot/make/linux/makefiles/saproc.make +@@ -61,12 +61,15 @@ # if $(AGENT_DIR) does not exist, we don't build SA # also, we don't build SA on Itanium or zero. @@ -45,7 +71,9 @@ ifneq ($(wildcard $(AGENT_DIR)),) ifneq ($(filter-out ia64 zero,$(SRCARCH)),) BUILDLIBSAPROC = $(LIBSAPROC) -+endif endif endif ++endif + ifneq ($(ALT_SASRCDIR),) + ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR |