diff options
| author | tnn <tnn@pkgsrc.org> | 2015-02-10 19:31:53 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-02-10 19:31:53 +0000 |
| commit | da8199fcc649289fa625f26b3506cd44ab7dd061 (patch) | |
| tree | 99af20b49086d97e26d4c577d8da4f5cddaaed1b /lang | |
| parent | 3ea84fe704c38981e346b752238d5a8f4754b593 (diff) | |
| download | pkgsrc-da8199fcc649289fa625f26b3506cd44ab7dd061.tar.gz | |
Let the build find intermediate libs when it wants to run intermediate rmic.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk7/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 7f3845a0b57..011ae4a3b86 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.71 2015/02/10 14:57:35 tnn Exp $ +$NetBSD: distinfo,v 1.72 2015/02/10 19:31:53 tnn Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -108,7 +108,7 @@ SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2 SHA1 (patch-jaxws_make_Makefile) = fcaa667aa1187fd4f8f639d625c22f7a43abb642 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 -SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 +SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 697467f606ff6a13127ea9027018ca401d354e58 SHA1 (patch-jdk_make_com_sun_nio_Makefile) = ab2ce3fd1a1a8ad6009d81025cc07077abe9a048 SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile index 0f3b08cc1fd..8a73ffb2afa 100644 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile @@ -1,8 +1,9 @@ -$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ +$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 2012-08-10 17:21:31.000000000 +0000 +--- 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/ @@ -13,3 +14,12 @@ Disable SunOS multiarch. 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 |