mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-08 11:52:55 -04:00
26 lines
1.1 KiB
Plaintext
26 lines
1.1 KiB
Plaintext
$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.2 2015/02/10 19:31:54 tnn Exp $
|
|
|
|
Disable SunOS multiarch.
|
|
Let the build find intermediate libs when it wants to run intermediate rmic.
|
|
|
|
--- jdk/make/com/sun/jmx/Makefile.orig 2015-01-26 15:20:56.000000000 +0000
|
|
+++ jdk/make/com/sun/jmx/Makefile
|
|
@@ -106,7 +106,7 @@ FILES_ties = $(subst javax/management/
|
|
|
|
RMIC_JAVA = $(OUTPUTDIR)/bin/java
|
|
# need to treat 64bit solaris differently
|
|
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
|
|
+ifeq ($(PLATFORM)-$(LIBARCH), NOMULTIARCHsolaris-amd64)
|
|
RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
|
|
endif
|
|
ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
|
|
@@ -114,7 +114,7 @@ RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/jav
|
|
endif
|
|
|
|
ifeq ($(CROSS_COMPILE_ARCH),)
|
|
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
|
|
+RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
|
|
else
|
|
RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
|
|
endif
|