From owner-svn-ports-all@FreeBSD.ORG Sun Sep 28 10:40:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAAD2930; Sun, 28 Sep 2014 10:40:55 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADD2494; Sun, 28 Sep 2014 10:40:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SAetNT060936; Sun, 28 Sep 2014 10:40:55 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SAetve060935; Sun, 28 Sep 2014 10:40:55 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201409281040.s8SAetve060935@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Sun, 28 Sep 2014 10:40:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369447 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2014 10:40:56 -0000 Author: demon Date: Sun Sep 28 10:40:54 2014 New Revision: 369447 URL: http://svnweb.freebsd.org/changeset/ports/369447 QAT: https://qat.redports.org/buildarchive/r369447/ Log: Fix ImportError: /lib/libgcc_s.so.1: version GCC_4.6.0 required by /usr/local/lib/gcc48/libgfortran.so.3 not found error when importing numpy module. PR: 188114 Patch by Thierry Thomas Modified: head/math/py-numpy/Makefile Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sun Sep 28 10:38:02 2014 (r369446) +++ head/math/py-numpy/Makefile Sun Sep 28 10:40:54 2014 (r369447) @@ -3,7 +3,7 @@ PORTNAME= numpy PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= http://docs.scipy.org/doc/${PORTNAME}/:doc \ @@ -23,6 +23,7 @@ RUN_DEPENDS= nosetests:${PORTSDIR}/devel USES= fortran python USE_PYTHON= concurrent distutils py3kplist +LDFLAGS+= -shared OPTIONS_DEFINE= ATLAS SUITESPARSE DOCS OPTIONS_DEFAULT= SUITESPARSE @@ -48,14 +49,12 @@ PLIST_FILES+= man/man1/f2py.1.gz .endif post-extract: - @${CP} ${DISTDIR}/numpy-ref-${PORTVERSION}.pdf ${WRKDIR} - @${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR} + ${CP} ${DISTDIR}/numpy-ref-${PORTVERSION}.pdf ${WRKDIR} + ${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR} post-patch: - @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py - @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg -# ignore LDFLAGS from env, as it overrides internal flags (e.g. -shared) for some reason - @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompiler/__init__.py + ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py + ${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//