diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /x11/qt1 | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-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/qt1')
| -rw-r--r-- | x11/qt1/buildlink2.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/x11/qt1/buildlink2.mk b/x11/qt1/buildlink2.mk index 61639a97ac2..d56778c39b0 100644 --- a/x11/qt1/buildlink2.mk +++ b/x11/qt1/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/10/20 14:00:41 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/03/14 19:38:06 jlam Exp $ .if !defined(QT1_BUILDLINK2_MK) QT1_BUILDLINK2_MK= # defined @@ -15,13 +15,14 @@ BUILDLINK_FILES.qt1+= qt1/lib/libqt.* QTDIR= ${BUILDLINK_PREFIX.qt1}/qt1 BUILDLINK_CPPFLAGS.qt1= -I${QTDIR}/include -BUILDLINK_LDFLAGS.qt1= -L${QTDIR}/lib -Wl,-R${QTDIR}/lib +BUILDLINK_LDFLAGS.qt1= -L${QTDIR}/lib -Wl,${RPATH_FLAG}${QTDIR}/lib +FIX_RPATH+= BUILDLINK_LDFLAGS.qt1 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+= qt1-buildlink |