Date: Mon, 29 Sep 2014 15:53:39 +0200 From: Antoine Brodin <antoine@freebsd.org> To: Dmitry Sivachenko <demon@freebsd.org> Cc: python@freebsd.org Subject: Re: svn commit: r369447 - head/math/py-numpy Message-ID: <CAALwa8nfsijADS0kFaUwTiRQ-LeLhmHJ8mOK55PPJ9BwmR8V3w@mail.gmail.com> In-Reply-To: <201409281040.s8SAetve060935@svn.freebsd.org> References: <201409281040.s8SAetve060935@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
On Sun, Sep 28, 2014 at 12:40 PM, Dmitry Sivachenko <demon@freebsd.org> wrote: > 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 <thierry@FreeBSD.org> > > Modified: > head/math/py-numpy/Makefile Hi, This change breaks science/py-scipy http://package20.nyi.freebsd.org/data/91amd64-default-baseline/369506/logs/errors/py27-scipy-0.14.0_4.log Cheers, Antoine > > 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// > >help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8nfsijADS0kFaUwTiRQ-LeLhmHJ8mOK55PPJ9BwmR8V3w>