CVS commit: [pkgsrc-2017Q1] pkgsrc/lang/openjdk7

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu May 11 18:06:32 UTC 2017

Modified Files:
        pkgsrc/lang/openjdk7 [pkgsrc-2017Q1]: Makefile

Log Message:
Pullup ticket #5409 - requested by sevan
lang/openjdk7: build fix

Revisions pulled up:
- lang/openjdk7/Makefile                                        1.115

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Tue May  9 14:26:06 UTC 2017

   Modified Files:
           pkgsrc/lang/openjdk7: Makefile

   Log Message:
   Ensure we use the correct rpath to zlib.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.113.2.1 pkgsrc/lang/openjdk7/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk7/Makefile
diff -u pkgsrc/lang/openjdk7/Makefile:1.113 pkgsrc/lang/openjdk7/Makefile:1.113.2.1
--- pkgsrc/lang/openjdk7/Makefile:1.113 Sun Feb 12 06:25:38 2017
+++ pkgsrc/lang/openjdk7/Makefile       Thu May 11 18:06:31 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.113 2017/02/12 06:25:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.113.2.1 2017/05/11 18:06:31 bsiegert Exp $
 
 JDK_MICRO=     80
 DISTNAME=      openjdk-1.7.${JDK_MICRO}-20150609
 PKGNAME=       openjdk7-1.7.${JDK_MICRO}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
@@ -20,8 +20,8 @@ DIST_SUBDIR=  openjdk7
 
 JAVA_NAME=     openjdk7
 JAVA_HOME=     ${PREFIX}/java/${JAVA_NAME}
-JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps keytool orbd \
-               policytool rmid rmiregistry servertool tnameserv
+JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jps jstack keytool \
+               orbd policytool rmid rmiregistry servertool tnameserv
 
 MAKE_ENV+=             PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
 MAKE_ENV+=             PKGSRC_UNZIP=${TOOLS_PATH.unzip}
@@ -52,7 +52,7 @@ MAKE_ENV+=    ALT_PACKAGE_PATH=${PREFIX}
 MAKE_ENV+=     RHINO_JAR=${WRKDIR}/${RHINO}/js.jar
 
 MAKE_ENV+=     BUILDLINK_PREFIX.iconv=${BUILDLINK_PREFIX.iconv:Q}
-MAKE_ENV+=     ZLIB_LIBS="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
+MAKE_ENV+=     ZLIB_LIBS="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz"
 
 MAKE_ENV+=     ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
 MAKE_ENV+=     HOTSPOT_BUILD_JOBS=${MAKE_JOBS}