From 3ef633718c6eecbd852195de9329d45632a10352 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 14 Mar 2003 19:37:30 +0000 Subject: (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. --- x11/bbapm/Makefile | 4 ++-- x11/gnome-python/Makefile | 5 +++-- x11/gtk/Makefile | 4 ++-- x11/kdebase/Makefile | 7 +++++-- x11/kdelibs/Makefile | 7 +++++-- x11/khostchooser/Makefile | 7 +++++-- x11/qt1/buildlink2.mk | 7 ++++--- x11/qt2-libs/buildlink2.mk | 7 ++++--- x11/qt3-libs/buildlink2.mk | 7 ++++--- 9 files changed, 34 insertions(+), 21 deletions(-) (limited to 'x11') diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile index 454d78b15cc..84abca3097d 100644 --- a/x11/bbapm/Makefile +++ b/x11/bbapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/08 00:03:56 jschauma Exp $ +# $NetBSD: Makefile,v 1.4 2003/03/14 19:38:04 jlam Exp $ # based on # FreeBSD port: # ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp @@ -14,7 +14,7 @@ HOMEPAGE= http://bbtools.windsofstorm.net/ COMMENT= APM monitor for Blackbox GNU_CONFIGURE= yes -LDFLAGS+= -Wl,-R${X11BASE}/lib +USE_X11= yes # For now: # We use i386/apmvar.h; other architectures will require modification diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile index 1c7a53af9e0..be4960d3b58 100644 --- a/x11/gnome-python/Makefile +++ b/x11/gnome-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/02/22 00:49:27 mycroft Exp $ +# $NetBSD: Makefile,v 1.32 2003/03/14 19:38:04 jlam Exp $ DISTNAME= gnome-python-1.4.4 PKGNAME= ${PYPKGPREFIX}-gnome-1.4.4 @@ -26,11 +26,12 @@ PYBINMODULE= yes .include "../../mk/bsd.prefs.mk" +# XXX This doesn't quite work if _USE_RPATH=no. .if (${OBJECT_FMT} == a.out) post-configure: .for DIR in pygtk pygnome ${MV} ${WRKSRC}/${DIR}/Makefile ${WRKSRC}/${DIR}/Makefile.old - ${SED} -e 's#-Wl,-R#-R#g' ${WRKSRC}/${DIR}/Makefile.old \ + ${SED} -e 's#-Wl,-R#${RPATH_FLAG}#g' ${WRKSRC}/${DIR}/Makefile.old \ >${WRKSRC}/${DIR}/Makefile .endfor .endif diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index f7158c5b67a..dec0a112451 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2002/12/19 13:09:37 grant Exp $ +# $NetBSD: Makefile,v 1.79 2003/03/14 19:38:05 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -36,7 +36,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. # -X_LDFLAGS= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib +X_LDFLAGS= ${X11_LDFLAGS} GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 7bd6cf51a99..206d389b17a 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2003/03/09 19:28:17 jschauma Exp $ +# $NetBSD: Makefile,v 1.88 2003/03/14 19:38:05 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -26,7 +26,10 @@ CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ "--with-qt-dir=${QTDIR}/qt1" CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS} -DRMAN='\"${RMAN}\"'" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib EXTRACT_ONLY= ${DISTNAME}.tar.bz2 PLIST_SRC= ${WRKDIR}/PLIST diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 13475d237de..05578f22f29 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2002/10/20 14:06:00 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2003/03/14 19:38:06 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -26,7 +26,10 @@ CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 5bef956de2c..74282ebad0e 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/10/21 13:48:54 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2003/03/14 19:38:06 jlam Exp $ # DISTNAME= khostchooser-0.3 @@ -24,7 +24,10 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ --with-qt-dir=${QTDIR} CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" + all_libraries="${KDE_LDFLAGS}" + +FIX_RPATH+= KDE_LDFLAGS +KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib .include "../../graphics/libungif/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" 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 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 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}" -- cgit v1.2.3