[pkgsrc/pkgsrc-2017Q1]: pkgsrc/lang/openjdk7 Pullup ticket #5409 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae3c383c2ce0
branches:  pkgsrc-2017Q1
changeset: 360368:ae3c383c2ce0
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Thu May 11 18:06:31 2017 +0000

description:
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.

diffstat:

 lang/openjdk7/Makefile |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 864c6317c4be -r ae3c383c2ce0 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Thu May 11 18:04:57 2017 +0000
+++ b/lang/openjdk7/Makefile    Thu May 11 18:06:31 2017 +0000
@@ -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 @@
 
 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+=     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}