pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/pvm3 libtoolize and enable the building of sh...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f6f75afe9539
branches: trunk
changeset: 478234:f6f75afe9539
user: dmcmahill <dmcmahill%pkgsrc.org@localhost>
date: Mon Jul 19 22:41:16 2004 +0000
description:
libtoolize and enable the building of shared libs. This is needed
for packages such as p5-Parallel-Pvm on some archs since that package
creates a shared object. Should fix lossage seen on amd64 bulk
builds. Both packages which use pvm3 have been tested and still work.
diffstat:
parallel/pvm3/Makefile | 32 ++-
parallel/pvm3/PLIST | 18 +-
parallel/pvm3/distinfo | 12 +-
parallel/pvm3/patches/patch-am | 68 ++++++-
parallel/pvm3/patches/patch-bq | 188 ++++++++++++++++++
parallel/pvm3/patches/patch-br | 103 ++++++++++
parallel/pvm3/patches/patch-bs | 31 +++
parallel/pvm3/patches/patch-bt | 84 ++++++++
parallel/pvm3/patches/patch-bu | 274 +++++++++++++++++++++++++++
parallel/pvm3/patches/patch-bv | 69 ++++++
parallel/pvm3/patches/patch-bw | 407 +++++++++++++++++++++++++++++++++++++++++
parallel/pvm3/patches/patch-bx | 26 ++
12 files changed, 1295 insertions(+), 17 deletions(-)
diffs (truncated from 1429 to 300 lines):
diff -r dad912d08f40 -r f6f75afe9539 parallel/pvm3/Makefile
--- a/parallel/pvm3/Makefile Mon Jul 19 22:26:57 2004 +0000
+++ b/parallel/pvm3/Makefile Mon Jul 19 22:41:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/05/31 22:13:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.31 2004/07/19 22:41:16 dmcmahill Exp $
DISTNAME= pvm3.4.4
PKGNAME= pvm-3.4.4
@@ -21,17 +21,28 @@
USE_BUILDLINK3= yes
USE_FORTRAN= yes
USE_X11= yes
+USE_LIBTOOL= yes
PVM_ROOT= ${WRKSRC}
MAKE_ENV+= PVM_ROOT=${WRKSRC}
MAKE_ENV+= PVM_ARCH=
MAKE_ENV+= SSH=${PVM_SSH}
+MAKE_ENV+= MKDIR="${MKDIR}"
+MAKE_ENV+= PVMLIB_VER=3:4
+MAKE_ENV+= PVM_DIR=${PVM_DIR}
ALL_TARGET= all install
# Set PVM_ARCH to the correct value for this machine platform.
.include "arch.mk"
PVM_DIR= ${PREFIX}/pvm3
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PVM_DIR}/lib/${PVM_ARCH}
+
+post-build:
+ ${CP} ${WRKSRC}/examples/${PVM_ARCH}/.libs/* \
+ ${WRKSRC}/bin/${PVM_ARCH}/.libs
+ -${CP} ${WRKSRC}/gexamples/${PVM_ARCH}/.libs/* \
+ ${WRKSRC}/bin/${PVM_ARCH}/.libs
# avoid installing this file
pre-install:
@@ -40,8 +51,10 @@
do-install:
${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/${PVM_ARCH}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PVM_ARCH}/* \
- ${PVM_DIR}/bin/${PVM_ARCH}
+ for f in ${WRKSRC}/bin/${PVM_ARCH}/* ; do \
+ ${ECHO} "Installing $$f" ; \
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} $$f \
+ ${PVM_DIR}/bin/${PVM_ARCH}/ ; done
${INSTALL_DATA_DIR} ${PVM_DIR}/conf
${INSTALL_DATA} ${WRKSRC}/conf/${PVM_ARCH}.def ${PVM_DIR}/conf
@@ -62,11 +75,18 @@
${INSTALL_DATA_DIR} ${PVM_DIR}/include
${INSTALL_DATA} ${WRKSRC}/include/* ${PVM_DIR}/include
-
${INSTALL_PROGRAM_DIR} ${PVM_DIR}/lib/${PVM_ARCH}
- ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PVM_ARCH}/pvm* \
+.for __tmp__ in pvm pvmgs
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+ ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}/
+.endfor
+ ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PVM_ARCH}/pvmd3 \
${PVM_DIR}/lib/${PVM_ARCH}
- ${INSTALL_DATA} ${WRKSRC}/lib/${PVM_ARCH}/*.a ${PVM_DIR}/lib/${PVM_ARCH}
+.for __tmp__ in libgpvm3.la libpvm3.la libpvmtrc.la libfpvm3.la
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+ ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}
+.endfor
+ ${LIBTOOL} --mode=finish ${PVM_DIR}/lib/${PVM_ARCH}
for f in `${LS} -1 ${WRKSRC}/lib`; do \
if [ -f ${WRKSRC}/lib/$$f ]; then \
${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${PVM_DIR}/lib; \
diff -r dad912d08f40 -r f6f75afe9539 parallel/pvm3/PLIST
--- a/parallel/pvm3/PLIST Mon Jul 19 22:26:57 2004 +0000
+++ b/parallel/pvm3/PLIST Mon Jul 19 22:41:16 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/09 15:24:25 is Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/07/19 22:41:16 dmcmahill Exp $
pvm3/bin/${PVM_ARCH}/dbwtest
pvm3/bin/${PVM_ARCH}/fgexample
pvm3/bin/${PVM_ARCH}/fmaster1
@@ -123,9 +123,25 @@
pvm3/lib/pvmtmparch
pvm3/lib/xpvm
pvm3/lib/${PVM_ARCH}/libfpvm3.a
+pvm3/lib/${PVM_ARCH}/libfpvm3.la
+pvm3/lib/${PVM_ARCH}/libfpvm3.so
+pvm3/lib/${PVM_ARCH}/libfpvm3.so.3
+pvm3/lib/${PVM_ARCH}/libfpvm3.so.3.4
pvm3/lib/${PVM_ARCH}/libgpvm3.a
+pvm3/lib/${PVM_ARCH}/libgpvm3.la
+pvm3/lib/${PVM_ARCH}/libgpvm3.so
+pvm3/lib/${PVM_ARCH}/libgpvm3.so.3
+pvm3/lib/${PVM_ARCH}/libgpvm3.so.3.4
pvm3/lib/${PVM_ARCH}/libpvm3.a
+pvm3/lib/${PVM_ARCH}/libpvm3.la
+pvm3/lib/${PVM_ARCH}/libpvm3.so
+pvm3/lib/${PVM_ARCH}/libpvm3.so.3
+pvm3/lib/${PVM_ARCH}/libpvm3.so.3.4
pvm3/lib/${PVM_ARCH}/libpvmtrc.a
+pvm3/lib/${PVM_ARCH}/libpvmtrc.la
+pvm3/lib/${PVM_ARCH}/libpvmtrc.so
+pvm3/lib/${PVM_ARCH}/libpvmtrc.so.3
+pvm3/lib/${PVM_ARCH}/libpvmtrc.so.3.4
pvm3/lib/${PVM_ARCH}/pvm
pvm3/lib/${PVM_ARCH}/pvmd3
pvm3/lib/${PVM_ARCH}/pvmgs
diff -r dad912d08f40 -r f6f75afe9539 parallel/pvm3/distinfo
--- a/parallel/pvm3/distinfo Mon Jul 19 22:26:57 2004 +0000
+++ b/parallel/pvm3/distinfo Mon Jul 19 22:41:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/07/18 18:05:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.12 2004/07/19 22:41:16 dmcmahill Exp $
SHA1 (pvm3.4.4.tgz) = 95bfabee61383fe2223ee2f539129bb54b5afb40
Size (pvm3.4.4.tgz) = 967852 bytes
@@ -14,7 +14,7 @@
SHA1 (patch-aj) = 4245e2a742022a0465015027361cae847cd6cbd6
SHA1 (patch-ak) = 9c5115017a05e184221de465ac8d9dad636f9c45
SHA1 (patch-al) = 7d5e0aa7e2c7177493fcfb7e799c7538143911a9
-SHA1 (patch-am) = 6fb271beb230e5fc5d5f0d720ba098b3b4352501
+SHA1 (patch-am) = 23f4cd8133ef9fa058aab6772f81206547a836cf
SHA1 (patch-an) = 7b0ba18a78a649a3ca20e17bc4a61e3b558b6ced
SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
@@ -44,3 +44,11 @@
SHA1 (patch-bn) = 31050e707a27256595f1ecc2fa48b45aabf69be4
SHA1 (patch-bo) = 69dd03e65ae75cf330a05eedd5507311523acfc1
SHA1 (patch-bp) = 5820e2ff17c58b2ee0ca7290bb8a259ff080087f
+SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
+SHA1 (patch-br) = 7a4f9f38e9d0d34c8a9b1aae4f409daf1b195e8a
+SHA1 (patch-bs) = 87140b9f45685471fc2814de9624e23666f81735
+SHA1 (patch-bt) = c52c750af0e51c857ae9b73eda6afc1923706ff4
+SHA1 (patch-bu) = 0ee41192bf7c350b22e3f4dd804f20792dbfee47
+SHA1 (patch-bv) = bf9a53cceb5d0c0cbe541a612e014c8421b470da
+SHA1 (patch-bw) = 881c72c6cb07428dd1110bed52a7cd3512259f3c
+SHA1 (patch-bx) = 7c22c0da74e8d09c8deb950b98f4e9652dcd57a7
diff -r dad912d08f40 -r f6f75afe9539 parallel/pvm3/patches/patch-am
--- a/parallel/pvm3/patches/patch-am Mon Jul 19 22:26:57 2004 +0000
+++ b/parallel/pvm3/patches/patch-am Mon Jul 19 22:41:16 2004 +0000
@@ -1,13 +1,65 @@
-$NetBSD: patch-am,v 1.3 2000/08/23 14:28:20 dmcmahill Exp $
-
---- ./xep/Makefile.aimk.orig Fri Aug 29 10:17:48 1997
-+++ ./xep/Makefile.aimk Sun Oct 31 11:47:13 1999
-@@ -25,6 +25,6 @@
+$NetBSD: patch-am,v 1.4 2004/07/19 22:41:16 dmcmahill Exp $
+
+--- xep/Makefile.aimk.orig Fri Aug 29 14:17:48 1997
++++ xep/Makefile.aimk Thu Mar 25 03:16:56 2004
+@@ -22,9 +22,8 @@
+ #CFLOPTS = -O
+ CFLOPTS = -g
+-CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
++CFLAGS = $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS)
LIBS = -l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
- XLIBS = -lXaw -lXmu -lXext -lXt -lX11
+-XLIBS = -lXaw -lXmu -lXext -lXt -lX11
-XCFLAGS = -I/usr/local/X11R5/include -I/usr/local/X11/include \
- -L/usr/local/X11R5/lib -L/usr/local/X11/lib
-+XCFLAGS = -I${X11BASE}/include \
-+ -L${X11BASE}/lib -Wl,-R$(X11BASE)/lib
++XLIBS = -L${X11BASE}/lib -Wl,${RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
++XCFLAGS = -I${X11BASE}/include
HEADERS = $(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \
+@@ -39,16 +38,23 @@
+ - mkdir $(XDIR)
+
++LTCC= $(LIBTOOL) --mode=compile $(CC)
++LTCC_LINK= $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} -L$(PVMLDIR)
++
+ mmain$(EXESFX): $(SDIR)/mmain.c $(XDIR) $(PVMLIBDEP)
+- $(CC) $(CFLAGS) -o $@ $(SDIR)/mmain.c $(LIBS)
+- mv $@ $(XDIR)
++ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/mmain.c $(LIBS)
++ cp $@ $(XDIR)
+
+ mtile$(EXESFX): $(SDIR)/mtile.c $(XDIR) $(PVMLIBDEP)
+- $(CC) $(CFLAGS) -o $@ $(SDIR)/mtile.c $(LIBS) -lm
+- mv $@ $(XDIR)
++ $(LTCC_LINK) $(CFLAGS) -o $@ $(SDIR)/mtile.c $(LIBS) -lm
++ ${MKDIR} $(XDIR)/.libs
++ -cp .libs/$@ $(XDIR)/.libs
++ cp $@ $(XDIR)
+
+ xep$(EXESFX): xep.o hostc.o calc.o imp.o $(XDIR) $(PVMLIBDEP)
+- $(CC) $(XCFLAGS) $(CFLAGS) -o $@ xep.o calc.o imp.o hostc.o \
++ $(LTCC_LINK) $(XCFLAGS) $(CFLAGS) -o $@ xep.lo calc.lo imp.lo hostc.lo \
+ $(XLIBS) $(LIBS) -lm
+- mv $@ $(XDIR)
++ ${MKDIR} $(XDIR)/.libs
++ -cp .libs/$@ $(XDIR)/.libs
++ cp $@ $(XDIR)
+
+ clean:
+@@ -56,13 +62,13 @@
+
+ xep.o: $(SDIR)/xep.c $(HEADERS)
+- $(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/xep.c
++ $(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/xep.c
+
+ imp.o: $(SDIR)/imp.c $(HEADERS)
+- $(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/imp.c
++ $(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/imp.c
+
+ calc.o: $(SDIR)/calc.c $(HEADERS)
+- $(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/calc.c
++ $(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/calc.c
+
+ hostc.o: $(SDIR)/hostc.c $(HEADERS)
+- $(CC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/hostc.c
++ $(LTCC) $(XCFLAGS) $(CFLAGS) -c $(SDIR)/hostc.c
+
diff -r dad912d08f40 -r f6f75afe9539 parallel/pvm3/patches/patch-bq
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/pvm3/patches/patch-bq Mon Jul 19 22:41:16 2004 +0000
@@ -0,0 +1,188 @@
+$NetBSD: patch-bq,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+
+--- src/Makefile.aimk.orig Fri May 11 18:58:10 2001
++++ src/Makefile.aimk Wed Mar 24 18:42:04 2004
+@@ -239,8 +239,12 @@
+
+ $(LIBDIR)/pvmd3$(EXESFX): pvmd3$(EXESFX)
++ ${MKDIR} ${LIBDIR}/.libs
++ -cp .libs/pvmd3$(EXESFX) ${LIBDIR}/.libs
+ cp pvmd3$(EXESFX) $(LIBDIR)
+
+ $(LIBDIR)/$(LIBPVM).a: $(LIBPVM).a
+- cp $(LIBPVM).a $(LIBDIR)
++ ${MKDIR} ${LIBDIR}/.libs
++ -cp .libs/* ${LIBDIR}/.libs
++ cp $(LIBPVM).* $(LIBDIR)
+
+ # libdir shm pvmd3 & libpvm3*.a
+@@ -285,11 +289,12 @@
+
+ pvmd3$(EXESFX): $(REGEXCONF) $(DOBJ) $(SOCKDOBJ)
+- $(CC) $(CFLAGS) -o pvmd3$(EXESFX) $(DOBJ) $(SOCKDOBJ) \
++ $(LIBTOOL) --mode=link $(CC) ${PVM_STATIC} $(CFLAGS) -o pvmd3$(EXESFX) $(DOBJ:.o=.lo) $(SOCKDOBJ:.o=.lo) \
+ $(LOPT) $(ARCHDLIB)
+
+ $(LIBPVM).a: $(REGEXCONF) $(LOBJ) $(LPVMSOCK) $(SOCKLOBJ)
+- rm -f $(LIBPVM).a
+- $(AR) cr $(LIBPVM).a $(LOBJ) $(LPVMSOCK) $(SOCKLOBJ)
+- case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBPVM).a ;; esac
++ ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${LOBJ:.o=.lo} \
++ ${LPVMSOCK:.o=.lo} ${SOCKLOBJ:.o=.lo} \
++ -rpath ${PVM_DIR}/lib/$(PVM_ARCH) \
++ -version-info ${PVMLIB_VER}
+
+ # shm pvmd3 & libpvm3*.a
+@@ -367,102 +372,105 @@
+ pvmalloc.c pvmcruft.c pvmerr.c pvmfrag.c tev.c global.c > Ll
+
++LTCC= ${LIBTOOL} --mode=compile ${CC}
++NODELTCC= ${LIBTOOL} --mode=compile ${NODECC}
++
+ amem.o: $(SDIR)/amem.s
+ $(AS) -o amem.o $(SDIR)/amem.s
+ ddpro.o: $(SDIR)/ddpro.c
+- $(CC) $(CFLAGS) -c $(SDIR)/ddpro.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/ddpro.c
+ host.o: $(SDIR)/host.c
+- $(CC) $(CFLAGS) -c $(SDIR)/host.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/host.c
+ hoster.o: $(SDIR)/hoster.c
+- $(CC) $(CFLAGS) -c $(SDIR)/hoster.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/hoster.c
+ imalloc.o: $(SDIR)/imalloc.c
+- $(CC) $(CFLAGS) -c $(SDIR)/imalloc.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/imalloc.c
+ lmsg.o: $(SDIR)/lmsg.c
+- $(NODECC) $(CFLAGS) -DIMA_NODE -c $(SDIR)/lmsg.c
++ $(NODELTCC) $(CFLAGS) -DIMA_NODE -c $(SDIR)/lmsg.c
+ lpvm.o: $(SDIR)/lpvm.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvm.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/lpvm.c
+ lpvmshmem.o: $(SDIR)/lpvmshmem.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvmshmem.c $(PLOCKFILE)
++ $(LTCC) $(CFLAGS) -c $(SDIR)/lpvmshmem.c $(PLOCKFILE)
+ lpvmmimd.o: $(SDIR)/lpvm.c
+- $(CC) $(CFLAGS) -DIMA_MPP -o lpvmmimd.o -c $(SDIR)/lpvm.c
++ $(LTCC) $(CFLAGS) -DIMA_MPP -o lpvmmimd.o -c $(SDIR)/lpvm.c
+ lpvmmpp.o: $(SDIR)/lpvmmpp.c
+- $(NODECC) $(CFLAGS) -DIMA_MPP -c $(SDIR)/lpvmmpp.c
++ $(NODELTCC) $(CFLAGS) -DIMA_MPP -c $(SDIR)/lpvmmpp.c
+ lpvmcat.o: $(SDIR)/lpvmcat.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvmcat.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/lpvmcat.c
+ lpvmgen.o: $(SDIR)/lpvmgen.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvmgen.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/lpvmgen.c
+ lpvmpack.o: $(SDIR)/lpvmpack.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvmpack.c
++ $(LTCC) $(CFLAGS) -c $(SDIR)/lpvmpack.c
+ lpvmglob.o: $(SDIR)/lpvmglob.c
+- $(CC) $(CFLAGS) -c $(SDIR)/lpvmglob.c
Home |
Main Index |
Thread Index |
Old Index