diff options
author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
---|---|---|
committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /x11/qt3-libs | |
parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.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/qt3-libs')
-rw-r--r-- | x11/qt3-libs/buildlink2.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk index 8775ea9d5c7..da670f528df 100644 --- a/x11/qt3-libs/buildlink2.mk +++ b/x11/qt3-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.11 2003/03/14 11:27:09 markd Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2003/03/14 19:38:07 jlam Exp $ .if !defined(QT3_LIBS_BUILDLINK2_MK) QT3_LIBS_BUILDLINK2_MK= # defined @@ -16,7 +16,8 @@ BUILDLINK_FILES.qt3-libs+= qt3/lib/libqt-mt.* QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 BUILDLINK_CPPFLAGS.qt3-libs= -I${QTDIR}/include -BUILDLINK_LDFLAGS.qt3-libs= -L${QTDIR}/lib -Wl,-R${QTDIR}/lib +BUILDLINK_LDFLAGS.qt3-libs= -L${QTDIR}/lib -Wl,${RPATH_FLAG}${QTDIR}/lib +FIX_RPATH+= BUILDLINK_LDFLAGS.qt3-libs PTHREAD_OPTS+= require @@ -31,7 +32,7 @@ PTHREAD_OPTS+= require CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" MAKE_ENV+= MOC="${QTDIR}/bin/moc" -LDFLAGS+= -Wl,-R${QTDIR}/lib +LDFLAGS+= -Wl,${RPATH_FLAG}${QTDIR}/lib .if !defined(BUILD_QT3) CONFIGURE_ENV+= QTDIR="${QTDIR}" |