diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
| commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /x11 | |
| parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
| download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-python/Makefile | 6 | ||||
| -rw-r--r-- | x11/qt3-libs/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/xcursorgen/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-server/files/host.def | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile index 71395c44679..8de22626306 100644 --- a/x11/gnome-python/Makefile +++ b/x11/gnome-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2004/04/27 02:04:07 snj Exp $ +# $NetBSD: Makefile,v 1.42 2004/08/27 06:29:11 jlam Exp $ DISTNAME= gnome-python-1.4.4 PKGNAME= ${PYPKGPREFIX}-gnome-1.4.4 @@ -33,8 +33,8 @@ PYBINMODULE= yes post-configure: .for DIR in pygtk pygnome ${MV} ${WRKSRC}/${DIR}/Makefile ${WRKSRC}/${DIR}/Makefile.old - ${SED} -e 's#-Wl,-R#${RPATH_FLAG}#g' ${WRKSRC}/${DIR}/Makefile.old \ - >${WRKSRC}/${DIR}/Makefile + ${SED} -e 's#-Wl,-R#${LINKER_RPATH_FLAG} #g' \ + ${WRKSRC}/${DIR}/Makefile.old >${WRKSRC}/${DIR}/Makefile .endfor .endif diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index b8a207e4e17..b40d6572c0d 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/05/07 15:25:13 cjep Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/08/27 06:29:11 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+ @@ -38,7 +38,7 @@ PTHREAD_OPTS+= require CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" MAKE_ENV+= MOC="${QTDIR}/bin/moc" -#LDFLAGS+= -Wl,${RPATH_FLAG}${QTDIR}/lib +#LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTDIR}/lib .if !defined(BUILD_QT3) CONFIGURE_ENV+= QTDIR="${QTDIR}" diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile index 2042eaa2b24..f880d15ad71 100644 --- a/x11/xcursorgen/Makefile +++ b/x11/xcursorgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/04/19 05:26:33 snj Exp $ +# $NetBSD: Makefile,v 1.11 2004/08/27 06:29:11 jlam Exp $ DISTNAME= xcursorgen-4.3.0 CATEGORIES= x11 @@ -21,6 +21,6 @@ PKG_SKIP_REASON="This package requires XFree86 4.3.0 or newer." .include "../../graphics/png/buildlink3.mk" -MAKE_ENV+= LOCAL_LDFLAGS="-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.png_DEFAULT}/lib" +MAKE_ENV+= LOCAL_LDFLAGS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.png_DEFAULT}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def index 626a116e187..6465593d6b1 100644 --- a/x11/xorg-server/files/host.def +++ b/x11/xorg-server/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.3 2004/08/11 15:36:36 recht Exp $ */ +/* $NetBSD: host.def,v 1.4 2004/08/27 06:29:11 jlam Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -32,7 +32,7 @@ #define StandardIncludes -I@BLNK@/include #define ExtraLoadFlags @LDFLAGS@ -#define PkgRpathFlags @_COMPILER_LD_FLAG@@RPATH_FLAG@ +#define PkgRpathFlags @COMPILER_RPATH_FLAG@ #define LinkerRuntimeLibraryPathFlag(path) Concat(PkgRpathFlags, path) #define XTrueTypeInstallCConvHeaders NO |