diff options
| author | joerg <joerg> | 2015-09-23 12:00:11 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-09-23 12:00:11 +0000 |
| commit | 92720efa8ba33fafb5311149d9e50219072316c6 (patch) | |
| tree | 3d488eb2d7f0b694d29c201f70e2ea260a06bba4 /math | |
| parent | e612b3a70bfd77bf70855d2df3c7727b21bc09a5 (diff) | |
| download | pkgsrc-92720efa8ba33fafb5311149d9e50219072316c6.tar.gz | |
Don't force mpi-ch, openmpi works just as well. Don't force manual
libraries when already using the mpicc wrapper.
Diffstat (limited to 'math')
| -rw-r--r-- | math/py-Scientific/Makefile | 4 | ||||
| -rw-r--r-- | math/py-Scientific/distinfo | 4 | ||||
| -rw-r--r-- | math/py-Scientific/patches/patch-ab | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index adcce7004d1..23809e99b1e 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/09/25 12:59:30 fhajny Exp $ +# $NetBSD: Makefile,v 1.40 2015/09/23 12:00:11 joerg Exp $ DISTNAME= ScientificPython-2.8.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} @@ -31,6 +31,6 @@ post-install: .include "../../devel/netcdf/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../math/py-numpy/buildlink3.mk" -.include "../../parallel/mpi-ch/buildlink3.mk" +.include "../../mk/mpi.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-Scientific/distinfo b/math/py-Scientific/distinfo index e71412ff282..7fd19084b22 100644 --- a/math/py-Scientific/distinfo +++ b/math/py-Scientific/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2014/04/16 14:51:24 wiz Exp $ +$NetBSD: distinfo,v 1.8 2015/09/23 12:00:11 joerg Exp $ SHA1 (ScientificPython-2.8.1.tar.gz) = 40842ffec473371ba3c9710ba609844007616388 RMD160 (ScientificPython-2.8.1.tar.gz) = 53131b769acafd0ef5e6b3e5f022e40ffa2b4663 Size (ScientificPython-2.8.1.tar.gz) = 559819 bytes SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c -SHA1 (patch-ab) = 5a9e4a8c744b02a10cb21e1f85b7cefa00109bef +SHA1 (patch-ab) = 159a6bb2da1f881e755a4c5c2c8c44cef2fb228a diff --git a/math/py-Scientific/patches/patch-ab b/math/py-Scientific/patches/patch-ab index 464bc21371a..7bcec264a59 100644 --- a/math/py-Scientific/patches/patch-ab +++ b/math/py-Scientific/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.3 2014/04/16 14:51:24 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2015/09/23 12:00:11 joerg Exp $ * Fixed NumPy as numeric package for user-destdir installation. * Honor CFLAGS and LDFLAGS. ---- Src/MPI/compile.py.orig 2008-08-18 12:54:41.000000000 +0000 +--- Src/MPI/compile.py.orig 2008-10-28 20:24:44.000000000 +0000 +++ Src/MPI/compile.py @@ -5,7 +5,6 @@ import distutils @@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2014/04/16 14:51:24 wiz Exp $ linkforshared = ' '.join(items) -cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \ -+cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lmpich -lopa -lmpl -lpython%s %s %s' % \ ++cmd = '%s %s %s -o mpipython -I../../Include %s -I%s %s %s -L%s -lpython%s %s %s' % \ (mpicompiler, + ldflags, linkforshared, |