diff options
Diffstat (limited to 'parallel/pvm3/patches/patch-br')
-rw-r--r-- | parallel/pvm3/patches/patch-br | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/parallel/pvm3/patches/patch-br b/parallel/pvm3/patches/patch-br index 788eb53bca2..6158dcc310e 100644 --- a/parallel/pvm3/patches/patch-br +++ b/parallel/pvm3/patches/patch-br @@ -1,14 +1,30 @@ -$NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ +$NetBSD: patch-br,v 1.2 2004/07/26 11:15:24 dmcmahill Exp $ --- tracer/Makefile.aimk.orig Thu Oct 1 21:13:24 1998 -+++ tracer/Makefile.aimk Wed Mar 24 18:26:39 2004 -@@ -24,4 +24,5 @@ ++++ tracer/Makefile.aimk +@@ -23,6 +23,7 @@ CFLOPTS = -O + #CC = gcc CFLAGS = $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) +LTCC= ${LIBTOOL} --mode=compile ${CC} -@@ -107,30 +108,34 @@ + # +@@ -56,10 +57,10 @@ SYSLIBS = $(ARCHLIB) + LIBPREFIX = lib + + PVMLIB = pvm3 +-PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a ++PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la + + TRCLIB = pvmtrc +-LIBPVMTRC = $(LIBPREFIX)$(TRCLIB).a ++LIBPVMTRC = $(LIBPREFIX)$(TRCLIB).la + TRCLIBDEP = $(PVMLDIR)/$(LIBPVMTRC) + + LIBS = $(LIBDIRS) -l$(TRCLIB) -l$(PVMLIB) $(SYSLIBS) +@@ -106,32 +107,36 @@ default: local + install: $(PVMXDIR) $(PVMLDIR) $(PROGS) $(PVMXDIR)/tracer$(EXESFX): tracer$(EXESFX) - @ cp tracer$(EXESFX) $(PVMXDIR) @@ -42,18 +58,20 @@ $NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ - @ cp $(LIBPVMTRC) $(PVMLDIR) + ${MKDIR} $(PVMLDIR)/.libs + -cp .libs/* $(PVMLDIR)/.libs -+ cp $(LIBPVMTRC:.a=.*) $(PVMLDIR) ++ cp $(LIBPVMTRC:.la=.*) $(PVMLDIR) $(LIBPVMTRC): $(TRCOBJS) $(PVMLDIR) - $(AR) rcv $(LIBPVMTRC) $(TRCOBJS) - @ case x$(HASRANLIB) in \ - xt ) echo "ranlib $(LIBPVMTRC)"; ranlib $(LIBPVMTRC) ;; \ - xf ) echo "No Ranlib Necessary." ;; esac -+ ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${TRCOBJS:.o=.lo} \ ++ ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${TRCOBJS:.o=.lo} \ + -rpath ${PVM_DIR}/lib/$(PVM_ARCH) -version-info ${PVMLIB_VER} $(PVMXDIR): -@@ -157,13 +162,13 @@ + - mkdir $(PVMBDIR) +@@ -156,15 +161,15 @@ veryclean: clean + tracer.o: $(SRCDIR)/tracer.c $(HEADERS) @ touch tracer.o - $(CC) $(CFLAGS) -c $(INCL) $(SRCDIR)/tracer.c @@ -70,7 +88,9 @@ $NetBSD: patch-br,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ + $(LTCC) $(CFLAGS) -c $(INCL) $(SRCDIR)/trcglob.c -@@ -174,24 +179,24 @@ + # +@@ -173,25 +178,25 @@ trcglob.o: $(SRCDIR)/trcglob.c $(HEADER + trcmess.o: $(TRCDIR)/trcmess.c $(TRCHEADERS) @ touch trcmess.o - $(CC) $(CFLAGS) -c $(INCL) $(TRCDIR)/trcmess.c |