pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Ensure we use the correct rpath to zlib.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6868d0490d73
branches:  trunk
changeset: 362234:6868d0490d73
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 09 14:26:06 2017 +0000

description:
Ensure we use the correct rpath to zlib.

diffstat:

 lang/openjdk7/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r d92e2282c019 -r 6868d0490d73 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Tue May 09 14:24:31 2017 +0000
+++ b/lang/openjdk7/Makefile    Tue May 09 14:26:06 2017 +0000
@@ -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+=     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}



Home | Main Index | Thread Index | Old Index