diff options
author | wennmach <wennmach> | 2003-11-27 17:02:25 +0000 |
---|---|---|
committer | wennmach <wennmach> | 2003-11-27 17:02:25 +0000 |
commit | e2a39a6ea966c2e2677b6dda485d1af64324cab6 (patch) | |
tree | 23ade70723915a87c2d7774fa2f46b1c9ff98236 | |
parent | 9c28f515363c6d2fb054918934efce614b8f6bf2 (diff) | |
download | pkgsrc-e2a39a6ea966c2e2677b6dda485d1af64324cab6.tar.gz |
o fix syntax error in src/fortran/configure
o avoid removing non-existent files, resulting in "rm: usage:" errors
-rw-r--r-- | parallel/mpi-ch/Makefile | 4 | ||||
-rw-r--r-- | parallel/mpi-ch/distinfo | 4 | ||||
-rw-r--r-- | parallel/mpi-ch/patches/patch-ax | 21 | ||||
-rw-r--r-- | parallel/mpi-ch/patches/patch-ay | 54 |
4 files changed, 80 insertions, 3 deletions
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index f0107c52ff8..aa94a73f22b 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2003/11/26 12:42:12 wennmach Exp $ +# $NetBSD: Makefile,v 1.23 2003/11/27 17:02:25 wennmach Exp $ DISTNAME= mpich-1.2.5-1a PKGNAME= mpich-1.2.5.1.1 -PKGREVISION= 1 +PKGREVISION= 2 WRKSRC= ${WRKDIR}/${DISTNAME:C/-1a//} CATEGORIES= parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo index 6a2dada514c..a707be81497 100644 --- a/parallel/mpi-ch/distinfo +++ b/parallel/mpi-ch/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2003/11/26 12:42:12 wennmach Exp $ +$NetBSD: distinfo,v 1.5 2003/11/27 17:02:25 wennmach Exp $ SHA1 (mpich-1.2.5-1a.tar.gz) = 28d9316601196169a8576ace94daf23f1b673c01 Size (mpich-1.2.5-1a.tar.gz) = 12381275 bytes @@ -16,3 +16,5 @@ SHA1 (patch-at) = faeec80f8e35546e830873886d00e4332444a29a SHA1 (patch-au) = 00a6f439d2bb65269780f2141dbd588b147e890d SHA1 (patch-av) = 5d4330ea9ff8e4fe09879f092b0e4032fba54c13 SHA1 (patch-aw) = a1a98f08743cd1d33187b37ceb24ff5c4fcd731a +SHA1 (patch-ax) = 4f11502bf24b69f3aa8994a175529dd5cfda3be1 +SHA1 (patch-ay) = 72ac437696041c4771913e8f36a6b379c9e1057a diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax new file mode 100644 index 00000000000..a1c3410262c --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ax @@ -0,0 +1,21 @@ +$NetBSD: patch-ax,v 1.1 2003/11/27 17:02:25 wennmach Exp $ + +Correct syntax error in configure. + +--- src/fortran/configure.orig Wed Nov 26 23:05:27 2003 ++++ src/fortran/configure Wed Nov 26 23:06:09 2003 +@@ -4601,12 +4601,12 @@ + ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5' + if { (eval echo configure:4603: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then + if test ! -d conftest ; then mkdir conftest2 ; fi +- { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ++ { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5' + for ldir in "-L" "-Wl,-L," ; do + if { (eval echo configure:4609: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then +- pac_cv_prog_f77_library_dir_flag="$ldir" ++ pac_cv_prog_f77_library_dir_flag="${ldir}" + break + fi + done diff --git a/parallel/mpi-ch/patches/patch-ay b/parallel/mpi-ch/patches/patch-ay new file mode 100644 index 00000000000..b90d13368e5 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ay @@ -0,0 +1,54 @@ +$NetBSD: patch-ay,v 1.1 2003/11/27 17:02:25 wennmach Exp $ + +"rm -rf" with no arguments causes "usage" error messages; avoid this. + +--- MPI-2-C++/configure.orig Wed Nov 26 23:33:22 2003 ++++ MPI-2-C++/configure Wed Nov 26 23:33:37 2003 +@@ -3249,15 +3249,13 @@ + ; return 0; } + EOF + if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* + libmpi_found=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -rf conftest* + libmpi_found=no + fi +-rm -f conftest* ++rm -rf conftest* + if test "$libmpi_found" = "yes"; then + echo "$ac_t""yes" 1>&6 + else +@@ -3465,12 +3463,10 @@ + ; return 0; } + EOF + if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* + use_pending=yes + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -rf conftest* + use_pending=no + fi + rm -f conftest* +@@ -3976,7 +3972,7 @@ + EOF + + fi +-/bin/rm -f conftest* ++rm -f conftest* + + # Don't ask. It's an AIX thing. <sob> + if test "$?host" = "0"; then +@@ -4052,7 +4048,7 @@ + EOF + + fi +-/bin/rm -f conftest* ++rm -f conftest* + + LDFLAGS=$SAVE_LDFLAGS + LIBS=$SAVE_LIBS |