pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Don't use "-Wl" on platforms which define "_USE_RPATH"...
details: https://anonhg.NetBSD.org/pkgsrc/rev/35b6225629e3
branches: trunk
changeset: 466338:35b6225629e3
user: tron <tron%pkgsrc.org@localhost>
date: Thu Jan 15 23:04:00 2004 +0000
description:
Don't use "-Wl" on platforms which define "_USE_RPATH" to "no". This
fixes build problems under Darwin.
diffstat:
converters/libiconv/buildlink2.mk | 4 +++-
devel/gettext-lib/buildlink2.mk | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (38 lines):
diff -r 9efca03e9a44 -r 35b6225629e3 converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Thu Jan 15 22:26:08 2004 +0000
+++ b/converters/libiconv/buildlink2.mk Thu Jan 15 23:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/10/31 02:09:19 dmcmahill Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/01/15 23:04:00 tron Exp $
.if !defined(ICONV_BUILDLINK2_MK)
ICONV_BUILDLINK2_MK= # defined
@@ -50,7 +50,9 @@
BUILDLINK_TRANSFORM+= S:-liconv:
. endif
.endif
+.if ${_USE_RPATH} != no
BUILDLINK_LIBICONV_LDADD= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+.endif
BUILDLINK_LIBICONV_LDADD+= ${_BLNK_ICONV_LDFLAGS}
LDFLAGS+= ${BUILDLINK_LIBICONV_LDADD}
diff -r 9efca03e9a44 -r 35b6225629e3 devel/gettext-lib/buildlink2.mk
--- a/devel/gettext-lib/buildlink2.mk Thu Jan 15 22:26:08 2004 +0000
+++ b/devel/gettext-lib/buildlink2.mk Thu Jan 15 23:04:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.24 2003/08/02 09:25:44 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.25 2004/01/15 23:04:00 tron Exp $
.if !defined(GETTEXT_BUILDLINK2_MK)
GETTEXT_BUILDLINK2_MK= # defined
@@ -88,7 +88,9 @@
.if ${_NEED_GNU_GETTEXT} == "YES"
_BLNK_INCINTL+= -I${BUILDLINK_PREFIX.gettext}/include
_BLNK_LIBINTL+= -L${BUILDLINK_PREFIX.gettext}/lib
+.if ${_USE_RPATH} != no
_BLNK_LIBINTL+= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.gettext}/lib
+.endif
_BLNK_LIBINTL+= -lintl
. if ${_GETTEXT_NEEDS_ICONV} == "YES"
_BLNK_LIBINTL+= ${BUILDLINK_LIBICONV_LDADD}
Home |
Main Index |
Thread Index |
Old Index