From owner-svn-ports-head@FreeBSD.ORG Sat Dec 14 06:44:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43DEB8DA; Sat, 14 Dec 2013 06:44:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 15EDA1CCB; Sat, 14 Dec 2013 06:44:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE6ic7x042907; Sat, 14 Dec 2013 06:44:38 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE6icHv042906; Sat, 14 Dec 2013 06:44:38 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312140644.rBE6icHv042906@svn.freebsd.org> From: Kubilay Kocak Date: Sat, 14 Dec 2013 06:44:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336423 - head/math/py-numpy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 06:44:39 -0000 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