diff options
Diffstat (limited to 'parallel/pvm3/patches/patch-bt')
| -rw-r--r-- | parallel/pvm3/patches/patch-bt | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/parallel/pvm3/patches/patch-bt b/parallel/pvm3/patches/patch-bt index c1ede03870b..3c7e0bfadf3 100644 --- a/parallel/pvm3/patches/patch-bt +++ b/parallel/pvm3/patches/patch-bt @@ -1,8 +1,27 @@ -$NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ +$NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $ --- pvmgs/Makefile.aimk.orig Wed Feb 16 21:49:03 2000 -+++ pvmgs/Makefile.aimk Thu Mar 25 01:45:35 2004 -@@ -58,15 +58,22 @@ ++++ pvmgs/Makefile.aimk +@@ -26,7 +26,7 @@ PVMXDIR = $(PVMBDIR)/$(PVM_ARCH) + PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH) + PVMLIB = pvm3 + LIBPREFIX = lib +-PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a ++PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la + CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \ + $(ARCHCFLAGS) + LIBS = $(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB) +@@ -39,7 +39,7 @@ PROGS = $(PVMXDIR)/pvm_gstat$(EXESFX) \ + + LPROGS = $(PVMLDIR)/pvmgs$(EXESFX) + +-LIBGPVM = $(LIBPREFIX)gpvm3.a ++LIBGPVM = $(LIBPREFIX)gpvm3.la + + install: all + +@@ -57,17 +57,24 @@ $(PVMLDIR): + - mkdir $(PVMLDIR) $(PVMXDIR)/pvm_gstat$(EXESFX): pvm_gstat$(EXESFX) + ${MKDIR} $(PVMXDIR)/.libs @@ -24,10 +43,12 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ - case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac + ${MKDIR} $(PVMLDIR)/.libs + -cp .libs/* $(PVMLDIR)/.libs -+ cp $(LIBGPVM:.a=.*) $(PVMLDIR) ++ cp $(LIBGPVM:.la=.*) $(PVMLDIR) $(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-mpp -@@ -76,16 +83,21 @@ + cp $(LIBGPVM) $(PVMLDIR) +@@ -75,18 +82,23 @@ $(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-m + touch $(PVMLDIR)/$(LIBGPVM)-mpp $(PVMLDIR)/pvmgs$(EXESFX): pvmgs$(EXESFX) + ${MKDIR} $(PVMLDIR)/.libs @@ -38,7 +59,7 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ + pvmgroups$(EXESFX): pvmgroups.o $(LIBGPVM) $(PVMLIBDEP) - $(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvmgroups.lo $(LIBGPVM:.a=.la) $(LIBS) ++ $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvmgroups.lo $(LIBGPVM) $(LIBS) pvmgs$(EXESFX): $(DOBJ) $(PVMLIBDEP) - $(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS) @@ -48,19 +69,23 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ rm -f $(LIBGPVM) - $(AR) cr $(LIBGPVM) $(LOBJ) - case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac -+ ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${LOBJ:.o=.lo} \ ++ ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o $@ ${LOBJ:.o=.lo} \ + -rpath ${PVM_DIR}/lib/$(PVM_ARCH) \ + -version-info ${PVMLIB_VER} $(LIBGPVM)-mpp: $(LOBJ) -@@ -96,5 +108,5 @@ + rm -f $(LIBGPVM) +@@ -95,7 +107,7 @@ $(LIBGPVM)-mpp: $(LOBJ) + touch $(LIBGPVM)-mpp pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP) - $(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvm_gstat.lo $(LIBGPVM:.a=.la) $(LIBS) ++ $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o $@ pvm_gstat.lo $(LIBGPVM) $(LIBS) clean: -@@ -111,15 +123,15 @@ + rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \ +@@ -110,17 +122,17 @@ lint: + # pvmgsu_core.o: $(SDIR)/pvmgsu_core.c - $(CC) $(CFLAGS) -c $(SDIR)/pvmgsu_core.c @@ -82,3 +107,4 @@ $NetBSD: patch-bt,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $ + $(LTCC) $(CFLAGS) -c $(SDIR)/pvmgs_func.c # + # Source File Dependencies |