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/qt3-libs | |
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/qt3-libs')
-rw-r--r-- | x11/qt3-libs/buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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}" |