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 /parallel/pvm3/patches/patch-bv | |
| 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 'parallel/pvm3/patches/patch-bv')
| -rw-r--r-- | parallel/pvm3/patches/patch-bv | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parallel/pvm3/patches/patch-bv b/parallel/pvm3/patches/patch-bv index da038bfbff8..a91fbf6cf12 100644 --- a/parallel/pvm3/patches/patch-bv +++ b/parallel/pvm3/patches/patch-bv @@ -1,4 +1,4 @@ -$NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ +$NetBSD: patch-bv,v 1.2 2004/08/27 06:29:10 jlam Exp $ --- gexamples/Makefile.aimk.orig Wed Feb 16 21:48:37 2000 +++ gexamples/Makefile.aimk Thu Mar 25 02:04:18 2004 @@ -6,9 +6,9 @@ $NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX) +LTCC= ${LIBTOOL} --mode=compile ${CC} -+LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} ++LTCC_LINK= ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} +LTFORT= ${LIBTOOL} --mode=compile ${FC} -+LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} ++LTFORT_LINK= ${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} + all: $(PROGS) |