[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Fix rpath usage. Discussed with tnn@, te...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a38af4220e9
branches:  trunk
changeset: 604058:1a38af4220e9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 22 05:57:50 2012 +0000

description:
Fix rpath usage. Discussed with tnn@, tested on i386 by hans@ and on
amd64 by me.

diffstat:

 lang/openjdk7/Makefile         |   8 +++++---
 lang/openjdk7/distinfo         |   6 +++---
 lang/openjdk7/patches/patch-ab |  20 +++++++++++++++++---
 lang/openjdk7/patches/patch-ak |  25 ++++++++++++++++++++++---
 4 files changed, 47 insertions(+), 12 deletions(-)

diffs (116 lines):

diff -r 3def7f67e94a -r 1a38af4220e9 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Tue May 22 05:55:59 2012 +0000
+++ b/lang/openjdk7/Makefile    Tue May 22 05:57:50 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2012/05/16 08:55:45 marino Exp $
+# $NetBSD: Makefile,v 1.35 2012/05/22 05:57:50 joerg Exp $
 
 DISTNAME=      openjdk-7-fcs-src-b147-27_jun_2011
 PKGNAME=       openjdk7-1.7.0.147.20110811
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
@@ -72,8 +72,10 @@
 MAKE_ENV+=     CLASSPATH=
 
 MAKE_ENV+=     EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
+BUILDDIR=      ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
+MAKE_ENV+=     LD_LIBRARY_PATH=${BUILDDIR}/lib/${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
 
-BUILDDIR=      ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
 PLIST_SUBST+=  ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
 PLIST_SUBST+=  LOWER_OPSYS=${LOWER_OPSYS}
 
diff -r 3def7f67e94a -r 1a38af4220e9 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Tue May 22 05:55:59 2012 +0000
+++ b/lang/openjdk7/distinfo    Tue May 22 05:57:50 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2012/05/16 08:55:45 marino Exp $
+$NetBSD: distinfo,v 1.16 2012/05/22 05:57:50 joerg Exp $
 
 SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
 RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
@@ -55,7 +55,7 @@
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
 SHA1 (patch-aa) = 1d0363634b55fd51bb89dc414760aed79e26d021
-SHA1 (patch-ab) = ff032cf67ea66d93d7faad7f5ea40373fd4f6f01
+SHA1 (patch-ab) = 5d6ccee7e3a1a06cfb109cb892be08c7fff1ff8f
 SHA1 (patch-ac) = c845134b3f7912b69c7773ca939f70d2dcd78fec
 SHA1 (patch-ad) = ab68ff2db078628069c925287c119c4cac6657f3
 SHA1 (patch-ae) = d3aa3e2522cfee59cfb69c7d92e511560fca78c2
@@ -64,7 +64,7 @@
 SHA1 (patch-ah) = 2632580f92b27506c33df8714ed163ef3ed9844f
 SHA1 (patch-ai) = 6d6c394c3de7578754b901686b88142cbc524ef7
 SHA1 (patch-aj) = bd12ccefa0044f4686b800a61989909c286cd96a
-SHA1 (patch-ak) = 5803f43746463db843108b2104a222690614d5b6
+SHA1 (patch-ak) = 70b8c1fb6193174ac798106e3344e6287ce8c1bf
 SHA1 (patch-al) = abd6cb67266ebfed437379f10ed79fcf747543b5
 SHA1 (patch-am) = 6caa02c10d0f231a26a16888cb4401f25d184986
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
diff -r 3def7f67e94a -r 1a38af4220e9 lang/openjdk7/patches/patch-ab
--- a/lang/openjdk7/patches/patch-ab    Tue May 22 05:55:59 2012 +0000
+++ b/lang/openjdk7/patches/patch-ab    Tue May 22 05:57:50 2012 +0000
@@ -1,8 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-ab,v 1.4 2012/05/22 05:57:50 joerg Exp $
 
---- jdk/make/common/shared/Sanity.gmk.orig     2011-08-11 12:31:36.000000000 +0000
+--- jdk/make/common/shared/Sanity.gmk.orig     2012-05-06 14:17:19.000000000 +0000
 +++ jdk/make/common/shared/Sanity.gmk
-@@ -809,7 +809,8 @@ ifdef OPENJDK
+@@ -517,12 +517,7 @@ sane-variant:
+ # LD_LIBRARY_PATH should not be set, unless you are insane.
+ ######################################################
+ sane-ld_library_path:
+-ifdef LD_LIBRARY_PATH
+-      @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set.  This may \n" \
+-         "      produce binaries binaries incorrectly.  Please unset it \n" \
+-         "      and start your build again. \n" \
+-         "" >> $(ERROR_FILE)
+-endif
++      true
+ 
+ ######################################################
+ # LD_LIBRARY_PATH_64 should not be set, unless you are insane.
+@@ -809,7 +804,8 @@ ifdef OPENJDK
        @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
            $(ECHO) "Failed to build freetypecheck." ) > $@
  
diff -r 3def7f67e94a -r 1a38af4220e9 lang/openjdk7/patches/patch-ak
--- a/lang/openjdk7/patches/patch-ak    Tue May 22 05:55:59 2012 +0000
+++ b/lang/openjdk7/patches/patch-ak    Tue May 22 05:57:50 2012 +0000
@@ -1,8 +1,27 @@
-$NetBSD: patch-ak,v 1.3 2010/01/15 19:18:42 tnn Exp $
+$NetBSD: patch-ak,v 1.4 2012/05/22 05:57:50 joerg Exp $
 
---- jdk/make/common/Defs-bsd.gmk.orig  2010-01-11 16:46:18.000000000 +0000
+--- jdk/make/common/Defs-bsd.gmk.orig  2012-05-06 14:17:19.000000000 +0000
 +++ jdk/make/common/Defs-bsd.gmk
-@@ -339,6 +339,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
+@@ -230,8 +230,7 @@ ifeq ($(OS_VENDOR), Apple)
+   LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -rpath -Xlinker @loader_path/%)
+   LDFLAGS_COMMON += -Xlinker -install_name -Xlinker @rpath/$(@F)
+ else
+-  LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
+-  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
++  LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
+ endif
+ 
+ #
+@@ -299,7 +298,7 @@ VM_NAME         = server
+ ifeq ($(OS_VENDOR),Apple)
+ JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+ else
+-JVMLIB          = -Xlinker -rpath -Xlinker $(LIBDIR)/$(LIBARCH)/$(VM_NAME) -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
++JVMLIB          = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+ endif
+ JAVALIB         = -ljava $(JVMLIB)
+ 
+@@ -365,6 +364,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
    SYSTEM_ZLIB = true
  endif