pkgsrc/parallel/pvm3/patches/patch-bv
jlam ca70938428 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.
2004-08-27 06:29:06 +00:00

69 lines
2.3 KiB
Text

$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
@@ -38,48 +38,53 @@
tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX)
+LTCC= ${LIBTOOL} --mode=compile ${CC}
+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} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
+
all: $(PROGS)
joinleave$(EXESFX): $(SDIR)/joinleave.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/joinleave.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/joinleave.c $(PVMLIB)
cp joinleave$(EXESFX) $(XDIR)
tst$(EXESFX): $(SDIR)/tst.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/tst.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/tst.c $(PVMLIB)
cp tst$(EXESFX) $(XDIR)
gs$(EXESFX): $(SDIR)/gs.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/gs.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/gs.c $(PVMLIB)
cp gs$(EXESFX) $(XDIR)
ge$(EXESFX): $(SDIR)/ge.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/ge.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/ge.c $(PVMLIB)
cp ge$(EXESFX) $(XDIR)
gexamp$(EXESFX): $(SDIR)/gexamp.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/gexamp.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/gexamp.c $(PVMLIB)
cp gexamp$(EXESFX) $(XDIR)
thb$(EXESFX): $(SDIR)/thb.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/thb.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/thb.c $(PVMLIB)
cp thb$(EXESFX) $(XDIR)
tnb$(EXESFX): $(SDIR)/tnb.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/tnb.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/tnb.c $(PVMLIB)
cp tnb$(EXESFX) $(XDIR)
tjl$(EXESFX): $(SDIR)/tjl.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/tjl.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/tjl.c $(PVMLIB)
cp tjl$(EXESFX) $(XDIR)
tjf$(EXESFX): $(SDIR)/tjf.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/tjf.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/tjf.c $(PVMLIB)
cp tjf$(EXESFX) $(XDIR)
trsg$(EXESFX): $(SDIR)/trsg.c
- $(CC) $(CFLAGS) -o $@ $(SDIR)/trsg.c $(PVMLIB)
+ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/trsg.c $(PVMLIB)
cp trsg$(EXESFX) $(XDIR)
frsg$(EXESFX): $(SDIR)/frsg.f
- $(FORT) $(FFLAGS) -o $@ $(SDIR)/frsg.f $(PVMFLIB)
+ $(LTFORT_LINK) $(FFLAGS) -o $@ $(SDIR)/frsg.f $(PVMFLIB)
cp frsg$(EXESFX) $(XDIR)