From 06664fc325a28f588559d05879de4ef74f49367b Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Wed, 10 Jun 2015 13:29:57 +0000
Subject: Fix rpath in launchers for builds w/ dynamic libjli. Bump.

---
 lang/openjdk8/Makefile                                  |  3 ++-
 lang/openjdk8/distinfo                                  |  4 ++--
 lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index dac859aa382..b410367233a 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2015/06/10 11:38:51 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/10 13:29:57 tnn Exp $
 
 DISTNAME=	openjdk-1.8.45-20150610
 PKGNAME=	openjdk8-1.8.45
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 635a46a39e6..3961f471592 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/06/10 11:38:51 tnn Exp $
+$NetBSD: distinfo,v 1.18 2015/06/10 13:29:57 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -47,7 +47,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_generated-configure.sh) = f754ad280fc9bb235ddf515d84ddb4db0e0bf096
-SHA1 (patch-common_autoconf_spec.gmk.in) = e39f543e7e16bd63ee33696192221a99c7e06505
+SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
 SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
diff --git a/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in b/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
index db22f576457..40d020c1437 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
+++ b/lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_autoconf_spec.gmk.in,v 1.3 2015/03/02 03:53:26 tnn Exp $
+$NetBSD: patch-common_autoconf_spec.gmk.in,v 1.4 2015/06/10 13:29:57 tnn Exp $
 
---- common/autoconf/spec.gmk.in.orig	2015-02-02 15:31:06.000000000 +0000
+--- common/autoconf/spec.gmk.in.orig	2015-06-10 10:29:06.000000000 +0000
 +++ common/autoconf/spec.gmk.in
-@@ -349,7 +349,8 @@ LD:=@FIXPATH@ @LD@
+@@ -352,7 +352,8 @@ LD:=@FIXPATH@ @LD@
  USING_BROKEN_SUSE_LD:=@USING_BROKEN_SUSE_LD@
  
  # LDFLAGS used to link the jdk native libraries (C-code)
@@ -12,7 +12,16 @@ $NetBSD: patch-common_autoconf_spec.gmk.in,v 1.3 2015/03/02 03:53:26 tnn Exp $
  LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_SUFFIX@
  
  # On some platforms the linker cannot be used to create executables, thus
-@@ -443,7 +444,7 @@ JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JA
+@@ -360,7 +361,7 @@ LDFLAGS_JDKLIB_SUFFIX:=@LDFLAGS_JDKLIB_S
+ LDEXE:=@FIXPATH@ @LDEXE@
+ 
+ # LDFLAGS used to link the jdk native launchers (C-code)
+-LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
++LDFLAGS_JDKEXE:=-Xlinker -R@prefix@/java/openjdk8/jre/lib@OPENJDK_TARGET_CPU_LIBDIR@/jli @LDFLAGS_JDKEXE@
+ LDFLAGS_JDKEXE_SUFFIX:=@LDFLAGS_JDKEXE_SUFFIX@
+ 
+ # LDFLAGS specific to C++ linking.
+@@ -449,7 +450,7 @@ JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/jav
  JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac
  # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
  # overriding that value by using ?=.
-- 
cgit v1.2.3