svn commit: r336423 - head/math/py-numpy

Kubilay Kocak koobs at FreeBSD.org
Sat Dec 14 06:44:39 UTC 2013


Author: koobs
Date: Sat Dec 14 06:44:38 2013
New Revision: 336423
URL: http://svnweb.freebsd.org/changeset/ports/336423

Log:
  math/py-numpy: Fix static library check that assumes atlas is installed
  
  - Use BUILD_DEPENDS to check for the atlas static library at pre-build
    time instead of checking if the file exists (False if atlas is not
    installed)
  
  - Replace IGNORE with a message to the user notifying them that
    an atlas install WITH_STATIC is needed, and provide clues as possible
    actions without being too prescriptive.
  
  As discussed with eadler@, a correct resolution to "ports depending on other ports with specific OPTIONS" is either an atlas slave port
  (ie: atlas-static), or to modify atlas to install both shared and static
  libraries.
  
  This change is a net gain on the existing broken behaviour, by fixing
  the check, while retaining the user notification.
  
  PR:		ports/178094
  Reviewed by:	jhibbits, eadler
  Approved by:	maintainer timeout (7+ months)

Modified:
  head/math/py-numpy/Makefile

Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile	Sat Dec 14 06:04:59 2013	(r336422)
+++ head/math/py-numpy/Makefile	Sat Dec 14 06:44:38 2013	(r336423)
@@ -56,9 +56,14 @@ DISTFILES+=	${FP_ARCH}/fenv.c?p=203441:f
 
 .if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-.if !exists(${LOCALBASE}/lib/libalapack.a)
-IGNORE=	atlas needs to be built with WITH_STATIC for numpy to function properly
-.endif
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libalapack.a
+@${ECHO_MSG}
+@${ECHO_MSG} "Atlas *must* be built with the WITH_STATIC option"
+@${ECHO_MSG} "for numpy to function correctly. Ensure it is"
+@${ECHO_MSG} "selected in the configuration dialog when prompted, or"
+@${ECHO_MSG} "Ctrl-C now and reinstall the atlas port with the option"
+@${ECHO_MSG} "enabled.
+sleep 5
 .else
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack \
 		blas.2:${PORTSDIR}/math/blas


More information about the svn-ports-head mailing list