mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-21 20:32:15 +02:00
166ad0377b
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?)
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
--- 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
|
|
|