Add dependency on math/umfpack to avoid it being accidently detected

at build time. Also fix a build issue. Breakage spotted by naddy@.

ok naddy@
This commit is contained in:
eric 2009-04-05 18:08:34 +00:00
parent 914bdec8dd
commit 5bc386b996
2 changed files with 11 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 14:42:37 eric Exp $
# $OpenBSD: Makefile,v 1.2 2009/04/05 18:08:34 eric Exp $
COMMENT= maths, science and engineering modules for Python
MODPY_EGG_VERSION= 0.7.0
DISTNAME= scipy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
PKGNAME= py-${DISTNAME}p0
CATEGORIES= math devel
MAINTAINER= Eric Faurot <eric@openbsd.org>
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= blas g2c lapack m
WANTLIB= amd blas g2c lapack m
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scipy/}
HOMEPAGE= http://numeric.scipy.org/
@ -24,12 +24,15 @@ MODULES= lang/python
MODPY_SETUPTOOLS= Yes
MODPY_SETUP= setupegg.py
BUILD_DEPENDS= ::math/py-numpy
BUILD_DEPENDS= ::math/py-numpy \
::devel/swig
LIB_DEPENDS= umfpack::math/umfpack
RUN_DEPENDS= ${BUILD_DEPENDS}
REGRESS_DEPENDS= ::devel/py-nose
MAKE_ENV+= LDSHARED="${CC} -shared -fPIC"
MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/amd"
do-regress: fake
${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -c \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/16 14:42:38 eric Exp $
@comment $OpenBSD: PLIST,v 1.2 2009/04/05 18:08:34 eric Exp $
lib/python${MODPY_VERSION}/site-packages/scipy/
lib/python${MODPY_VERSION}/site-packages/scipy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/scipy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -637,6 +637,9 @@ lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/tests/test_l
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/__init__.py
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/__umfpack.so
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/_umfpack.py
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/_umfpack.pyc
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/info.py
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/info.pyc
lib/python${MODPY_VERSION}/site-packages/scipy/sparse/linalg/dsolve/umfpack/setup.py