summaryrefslogtreecommitdiff
path: root/x11/qt2-libs
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-03-14 19:37:30 +0000
committerjlam <jlam@pkgsrc.org>2003-03-14 19:37:30 +0000
commit3ef633718c6eecbd852195de9329d45632a10352 (patch)
tree4ee2e06249d68477cf3fb68be1f095453bcec90d /x11/qt2-libs
parent1940384395085677c2036358dfcccfad791a4dd8 (diff)
downloadpkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for worse. (2) Create a new variable FIX_RPATH that lists variables that should be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and additional variables may be appended from package Makefiles.
Diffstat (limited to 'x11/qt2-libs')
-rw-r--r--x11/qt2-libs/buildlink2.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk
index 6fcde7b7568..1a5fcd23d4f 100644
--- a/x11/qt2-libs/buildlink2.mk
+++ b/x11/qt2-libs/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/12 22:07:30 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/14 19:38:07 jlam Exp $
.if !defined(QT2_LIBS_BUILDLINK2_MK)
QT2_LIBS_BUILDLINK2_MK= # defined
@@ -15,7 +15,8 @@ BUILDLINK_FILES.qt2-libs+= qt2/lib/libqt.*
QTDIR= ${BUILDLINK_PREFIX.qt2-libs}/qt2
BUILDLINK_CPPFLAGS.qt2-libs= -I${QTDIR}/include
-BUILDLINK_LDFLAGS.qt2-libs= -L${QTDIR}/lib -Wl,-R${QTDIR}/lib
+BUILDLINK_LDFLAGS.qt2-libs= -L${QTDIR}/lib -Wl,${RPATH_FLAG}${QTDIR}/lib
+FIX_RPATH+= BUILDLINK_LDFLAGS.qt2-libs
.include "../../devel/zlib/buildlink2.mk"
.include "../../graphics/MesaLib/buildlink2.mk"
@@ -28,7 +29,7 @@ CONFIGURE_ENV+= QTDIR="${QTDIR}"
CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
MAKE_ENV+= QTDIR="${QTDIR}"
MAKE_ENV+= MOC="${QTDIR}/bin/moc"
-LDFLAGS+= -Wl,-R${QTDIR}/lib
+LDFLAGS+= -Wl,${RPATH_FLAG}${QTDIR}/lib
BUILDLINK_TARGETS+= qt2-libs-buildlink