CVS commit: pkgsrc/lang/openjdk7

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.114 -r1.115 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.114 pkgsrc/lang/openjdk7/Makefile:1.115
--- pkgsrc/lang/openjdk7/Makefile:1.114 Thu Mar 30 12:41:42 2017
+++ pkgsrc/lang/openjdk7/Makefile       Tue May  9 14:26:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2017/03/30 12:41:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.115 2017/05/09 14:26:06 jperkin Exp $
 
 JDK_MICRO=     80
 DISTNAME=      openjdk-1.7.${JDK_MICRO}-20150609
@@ -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}