diff options
| author | tnn <tnn> | 2015-06-10 13:29:57 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-06-10 13:29:57 +0000 |
| commit | 63e6706b9ee633910b9ef02d5ad70435db142a50 (patch) | |
| tree | 9a183530c0e1028e74c871b4e1856b9d27d2835f /lang/openjdk8/patches | |
| parent | 1d47d16bbbcce04236da6223969184f2af4c1c60 (diff) | |
| download | pkgsrc-63e6706b9ee633910b9ef02d5ad70435db142a50.tar.gz | |
Fix rpath in launchers for builds w/ dynamic libjli.
Bump.
Diffstat (limited to 'lang/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-common_autoconf_spec.gmk.in | 17 |
1 files changed, 13 insertions, 4 deletions
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 ?=. |