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 | 2347df5518184e316028bf90a0d032ee71028b63 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /textproc | |
| parent | e5a1b353192b781a2b5c36eca0f963c97d681caa (diff) | |
| download | pkgsrc-2347df5518184e316028bf90a0d032ee71028b63.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 'textproc')
| -rw-r--r-- | textproc/lua-expat/distinfo | 4 | ||||
| -rw-r--r-- | textproc/lua-expat/patches/patch-aa | 4 | ||||
| -rw-r--r-- | textproc/py-xml/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/textproc/lua-expat/distinfo b/textproc/lua-expat/distinfo index 7e18b05095f..24652e59213 100644 --- a/textproc/lua-expat/distinfo +++ b/textproc/lua-expat/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/08/27 06:29:10 jlam Exp $ SHA1 (luaexpat-1.0a.tar.gz) = f9393bf4cc1f41b34336b4f2e14fdbf7adf06c55 Size (luaexpat-1.0a.tar.gz) = 16460 bytes -SHA1 (patch-aa) = 6c7d49c6d153170b6475b4fcbfedc67cd8e34cd7 +SHA1 (patch-aa) = d43302660e93f44082a0b249490298db02d6f32d SHA1 (patch-ab) = 3e083f15ef99fc6e0931416f092093ed821f4927 diff --git a/textproc/lua-expat/patches/patch-aa b/textproc/lua-expat/patches/patch-aa index 6ef6534f47a..ea961946a19 100644 --- a/textproc/lua-expat/patches/patch-aa +++ b/textproc/lua-expat/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $ --- makefile.orig 2004-01-29 22:54:22.000000000 +0000 +++ makefile 2004-01-29 22:58:13.000000000 +0000 @@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/05 13:57:53 xtraeme Exp $ liblxp.so : lxplib.o - ld -o liblxp.so -shared lxplib.o -lexpat -+ ld -o liblxp.so -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -shared lxplib.o -lexpat ++ ld -o liblxp.so -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared lxplib.o -lexpat liblxp.dylib : lxplib.o gcc -o liblxp.dylib -dynamiclib lxplib.o -lexpat -llua.5.0 -llualib.5.0 diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index df7492b50d5..23a3415f78c 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/07/22 09:16:02 recht Exp $ +# $NetBSD: Makefile,v 1.4 2004/08/27 06:29:10 jlam Exp $ # DISTNAME= PyXML-0.8.3 @@ -19,7 +19,7 @@ PYBINMODULE= yes BUILDLINK_DEPENDS.expat= expat>=1.95.6 PYSETUPBUILDARGS+= --with-libexpat=${BUILDLINK_DIR} PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" -EXPAT_LDFLAGS= -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib +EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib FIX_RPATH+= EXPAT_LDFLAGS PYXML_SCRIPTS= scripts/xmlproc_parse \ |