Date: Thu, 20 Feb 2014 08:03:41 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345173 - in head/math/py-numpy: . files Message-ID: <201402200803.s1K83fAE033162@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Thu Feb 20 08:03:41 2014 New Revision: 345173 URL: http://svnweb.freebsd.org/changeset/ports/345173 QAT: https://qat.redports.org/buildarchive/r345173/ Log: - clean-up WITH_FIXED_FENV conditional, because it is only used for versions of FreeBSD, we not support anymore. - remove LATEST_LINK. There is PYTHON_PKGNAMEPREFIX set and in future we may have this package built against different python versions. Deleted: head/math/py-numpy/files/fenv.patch Modified: head/math/py-numpy/Makefile head/math/py-numpy/distinfo Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Thu Feb 20 08:01:28 2014 (r345172) +++ head/math/py-numpy/Makefile Thu Feb 20 08:03:41 2014 (r345173) @@ -25,7 +25,7 @@ OPTIONS_DEFAULT= SUITESPARSE ATLAS_DESC= Use optimized blas library SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse -USES= fortran +USE_FORTRAN= yes USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95 @@ -33,28 +33,10 @@ PYDISTUTILS_BUILDARGS+= --fcompiler=gnu PYTHON_PY3K_PLIST_HACK= yes PORTDOCS= * -LATEST_LINK= py-${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME:S/r/rc/} .include <bsd.port.pre.mk> -.if (${OSVERSION} <= 703100 || \ -(${OSVERSION} >= 800000 && ${OSVERSION} <= 800502) || \ -(${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && \ -(${ARCH} == "i386" || ${ARCH} == "amd64") -WITH_FIXED_FENV= yes -.endif - -.if defined(WITH_FIXED_FENV) -MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/:fp -.if ${ARCH} == "i386" -FP_ARCH= i387 -.elif ${ARCH} == "amd64" -FP_ARCH= ${ARCH} -.endif -DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp -.endif - .if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas .else @@ -77,15 +59,8 @@ post-patch: @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompiler/__init__.py GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so// + pre-configure: -.if defined(WITH_FIXED_FENV) - @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ - ${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ - ${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ - ${REINPLACE_CMD} -e 's|<fenv.h>|"fenv.h"|' ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ - ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/fenv.patch; \ - fi -.endif .if ${PORT_OPTIONS:MATLAS} @${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg .else @@ -99,27 +74,10 @@ pre-configure: ${WRKSRC}/site.cfg @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py -pre-install: -.if defined(WITH_FIXED_FENV) - @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ - ${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \ - fi -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-user-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} -.if defined(WITH_FIXED_FENV) - @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ - ${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \ - else \ - ${REINPLACE_CMD} -e "s|%%FENV%%|@comment |g" ${TMPPLIST}; \ - fi -.else - @${REINPLACE_CMD} -e "s|%%FENV%%|@comment |g" ${TMPPLIST} -.endif - .include <bsd.port.post.mk> Modified: head/math/py-numpy/distinfo ============================================================================== --- head/math/py-numpy/distinfo Thu Feb 20 08:01:28 2014 (r345172) +++ head/math/py-numpy/distinfo Thu Feb 20 08:03:41 2014 (r345173) @@ -4,11 +4,3 @@ SHA256 (numpy-ref-1.8.0.pdf) = 49ecb1d76 SIZE (numpy-ref-1.8.0.pdf) = 5324229 SHA256 (numpy-user-1.8.0.pdf) = a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SIZE (numpy-user-1.8.0.pdf) = 408447 -SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54 -SIZE (i387/fenv.c?p=203441) = 4791 -SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d -SIZE (i387/fenv.h?p=203441) = 6774 -SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0 -SIZE (amd64/fenv.c?p=203441) = 3601 -SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6 -SIZE (amd64/fenv.h?p=203441) = 5810
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402200803.s1K83fAE033162>