aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2014-10-30 19:52:48 +0800
committerdemon <demon@FreeBSD.org>2014-10-30 19:52:48 +0800
commit61545533819dc189d57025e2546f3ef7e55497f2 (patch)
tree6d64b2ec4b12e6831865c9df78ad81dd109de993
parent4ae8a81532846ca58a49d3f163420cde7badc47b (diff)
downloadfreebsd-ports-gnome-61545533819dc189d57025e2546f3ef7e55497f2.tar.gz
freebsd-ports-gnome-61545533819dc189d57025e2546f3ef7e55497f2.tar.zst
freebsd-ports-gnome-61545533819dc189d57025e2546f3ef7e55497f2.zip
Explicitly link with libblas to avoid errors like
import sklearn.decomposition.pca ImportError: /usr/local/lib/libcblas.so.2: Undefined symbol "cgemv_" due to it trying to import pairwise_fast.so PR: 194683 Update to version 0.15.2.
-rw-r--r--science/py-scikit-learn/Makefile12
-rw-r--r--science/py-scikit-learn/distinfo4
2 files changed, 10 insertions, 6 deletions
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index b6b068647fcd..50593a1ea481 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= scikit-learn
-PORTVERSION= 0.15.0
-PORTREVISION= 1
+PORTVERSION= 0.15.2
CATEGORIES= science python
MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
MASTER_SITE_SUBDIR=source/s/scikit-learn
@@ -17,6 +16,7 @@ RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0.8.0:${PORTSDIR}/science/py-scipy
USES= fortran python
+USE_PYTHON= distutils autoplist
OPTIONS_SINGLE= BLAS
OPTIONS_SINGLE_BLAS= CBLAS ATLAS
@@ -27,8 +27,12 @@ ATLAS_DESC= Use math/atlas as BLAS library
CBLAS_LIB_DEPENDS= libcblas.so:${PORTSDIR}/math/cblas
ATLAS_LIB_DEPENDS= libcblas.so:${PORTSDIR}/math/atlas
-LATEST_LINK= py-${PORTNAME}
+.include <bsd.port.options.mk>
-USE_PYTHON= distutils autoplist
+.if ${PORT_OPTIONS:MCBLAS}
+LDFLAGS+= -lblas
+.endif
+
+LATEST_LINK= py-${PORTNAME}
.include <bsd.port.mk>
diff --git a/science/py-scikit-learn/distinfo b/science/py-scikit-learn/distinfo
index 4a0ca1ee5f74..7af30ebb5077 100644
--- a/science/py-scikit-learn/distinfo
+++ b/science/py-scikit-learn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scikit-learn-0.15.0.tar.gz) = 67ae5dbe5c1a28b469007708d65c59b0af192b2a9396c33d0b2629c6304e4596
-SIZE (scikit-learn-0.15.0.tar.gz) = 7026712
+SHA256 (scikit-learn-0.15.2.tar.gz) = 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6
+SIZE (scikit-learn-0.15.2.tar.gz) = 7007922