diff options
author | dholland <dholland@pkgsrc.org> | 2016-09-18 07:46:09 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2016-09-18 07:46:09 +0000 |
commit | 32c8d8a9de39257dbe4f98b3d9bc501d63269d00 (patch) | |
tree | 2ec65b05dfa620d6663999389f0fda7075b16840 /www/swill | |
parent | 6d048fcf8aa490a4c65c34c211a3d64109ddc8b6 (diff) | |
download | pkgsrc-32c8d8a9de39257dbe4f98b3d9bc501d63269d00.tar.gz |
Make it accept --without-mpi. Fixes build.
Diffstat (limited to 'www/swill')
-rw-r--r-- | www/swill/distinfo | 3 | ||||
-rw-r--r-- | www/swill/patches/patch-configure | 37 |
2 files changed, 39 insertions, 1 deletions
diff --git a/www/swill/distinfo b/www/swill/distinfo index 18613e9991c..dda20eb55b4 100644 --- a/www/swill/distinfo +++ b/www/swill/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2016/08/15 19:53:52 wiz Exp $ +$NetBSD: distinfo,v 1.9 2016/09/18 07:46:09 dholland Exp $ SHA1 (swill-0.3-fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = 1628126f9629b1cf78a1e8d8b7bb0296b9085e9c RMD160 (swill-0.3-fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = d422a9999ea1168f116d95ec5be60ab24966988b @@ -8,3 +8,4 @@ SHA1 (patch-Makefile.in) = eedb76e89aee76b29a9d25cd47c4c0c3929cedf0 SHA1 (patch-Source_Objects_Makefile.in) = 963125eb9edc293a34923f818ec1472f44d5beb2 SHA1 (patch-Source_Objects_base_c) = ac8d6bee14f6db5bdbe38c33b6e0d46fc457a12b SHA1 (patch-Source_SWILL_Makefile.in) = 5b39b5292a3ae19c7a3e636027c91f828ee3edf1 +SHA1 (patch-configure) = 1b4de9ad20b1682eb29e157dde61443f45cf744b diff --git a/www/swill/patches/patch-configure b/www/swill/patches/patch-configure new file mode 100644 index 00000000000..e33e5a6b03a --- /dev/null +++ b/www/swill/patches/patch-configure @@ -0,0 +1,37 @@ +$NetBSD: patch-configure,v 1.1 2016/09/18 07:46:09 dholland Exp $ + +Handle --without-mpi instead of using the resulting "no" as a path and +also in that case make it not probe for mpi headers. + +--- configure.orig 2016-01-16 13:37:22.000000000 +0000 ++++ configure +@@ -1322,6 +1322,10 @@ else + MPIINCLUDE= + fi + ++if [ "x$MPIPACKAGE" = xno ]; then ++ unset MPIPACKAGE ++fi ++ + #AC_ARG_WITH(mpilib,[ --with-mpilib=PATH Set location of MPI library directory],[MPILIB="-L$withval"], [MPILIB=]) + + echo $ac_n "checking for MPI configuration""... $ac_c" 1>&6 +@@ -1365,6 +1369,9 @@ fi + # fi + + echo $ac_n "checking for MPI header files""... $ac_c" 1>&6 ++if [ "x${with_mpi}" = xno ]; then ++ echo "disabled" 1>&6 ++else + echo "configure:1369: checking for MPI header files" >&5 + if test -z "$MPIINCLUDE"; then + cat > conftest.$ac_ext <<EOF +@@ -1404,7 +1411,7 @@ fi + + #AC_SUBST(MPILIB) + +- ++fi # "x${with_mpi}" != xno + + + ######################################################################## |