Date: Mon, 14 Apr 2014 20:56:58 +0200 From: Rusmir Dusko <nemysis@FreeBSD.org> To: freebsd-python@freebsd.org Subject: math/py-numpy update to 1.8.1 Message-ID: <20140414205658.34ae32a0@nemysis3now>
next in thread | raw e-mail | index | archive | help
--Sig_/nstPop8BxG1OOc8zcYZ1Att Content-Type: multipart/mixed; boundary="MP_/5ZTkypySqHskSo+YJWLqSTP" --MP_/5ZTkypySqHskSo+YJWLqSTP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello Please look enclosed diff, test and commit, because i not have python@ commit bit. - Update to 1.8.1, announce message is here: http://sourceforge.net/projects/numpy/files/NumPy/1.8.1/ - Add IGNORE --> is this good - Break lines around 80 characters - Change REINPLACE, cosmetical changes - Strip libraries - Change patch f2py/f2py2e.py --> db_(Dianora) --=20 Best regards, Rusmir Dusko --MP_/5ZTkypySqHskSo+YJWLqSTP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=py-numpy.diff Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 350423) +++ Makefile (working copy) @@ -2,12 +2,11 @@ # $FreeBSD$ =20 PORTNAME=3D numpy -PORTVERSION=3D 1.8.0 -PORTREVISION=3D 1 +PORTVERSION=3D 1.8.1 PORTEPOCH=3D 1 CATEGORIES=3D math python -MASTER_SITES=3D http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \ - SF/${PORTNAME}/NumPy/${PORTVERSION}:source +MASTER_SITES=3D SF/${PORTNAME}/NumPy/${PORTVERSION}:source \ + http://docs.scipy.org/doc/${DISTNAME:C/\..$/.1/}/:doc PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} DISTFILES=3D numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \ numpy-ref-${PORTVERSION}.pdf:doc \ @@ -40,6 +39,9 @@ =20 .if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+=3D libatlas.so:${PORTSDIR}/math/atlas +. if !exists(${LOCALBASE}/lib/libalapack.a) +IGNORE=3D ATLAS needs to be built with STATIC for NumPy to function proper= ly +. endif .else LIB_DEPENDS+=3D liblapack.so:${PORTSDIR}/math/lapack \ libblas.so:${PORTSDIR}/math/blas @@ -54,10 +56,12 @@ @${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR} =20 post-patch: - @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompile= r/gnu.py + @${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) f= or some reason - @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompi= ler/__init__.py + @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" \ + ${WRKSRC}/numpy/distutils/fcompiler/__init__.py =20 GCCLIBDIR_CMDS=3D ${FC} -print-file-name=3Dlibgfortran.so|${SED} -e s/libg= fortran.so// =20 @@ -71,11 +75,19 @@ @${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/s= ite.cfg .endif @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ - -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ + -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ ${WRKSRC}/site.cfg - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/n= umpy/distutils/system_info.py + @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ + ${WRKSRC}/numpy/distutils/system_info.py =20 post-install: +.for l in core/operand_flag_tests core/struct_ufunc_test core/umath core/m= ultiarray \ + core/multiarray_tests core/_dummy core/umath_tests core/scalarmath \ + core/test_rational core/_dotblas lib/_compiled_base numarray/_capi \ + linalg/lapack_lite linalg/_umath_linalg random/mtrand fft/fftpack_lite + ${STRIP_CMD} ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/numpy/${l}.so +.endfor + ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/ma= n1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSD= IR} Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- distinfo (revision 350423) +++ distinfo (working copy) @@ -1,6 +1,6 @@ -SHA256 (numpy-1.8.0.tar.gz) =3D 2764d0819acc77e9ff81b060fe7f69530b0d85c26a= c9d162639b787cb227d253 -SIZE (numpy-1.8.0.tar.gz) =3D 3779617 -SHA256 (numpy-ref-1.8.0.pdf) =3D 49ecb1d768eb48598439cc63058f830ca3522fe1c= feba1a321086e9820ae8911 -SIZE (numpy-ref-1.8.0.pdf) =3D 5324229 -SHA256 (numpy-user-1.8.0.pdf) =3D a8c30360f9e46c63cfdf48fa594971d94d68ce59= ece08c13d4acde8b14032cfe -SIZE (numpy-user-1.8.0.pdf) =3D 408447 +SHA256 (numpy-1.8.1.tar.gz) =3D 3d722fc3ac922a34c50183683e828052cd9bb7e913= 4a95098441297d7ea1c7a9 +SIZE (numpy-1.8.1.tar.gz) =3D 3794076 +SHA256 (numpy-ref-1.8.1.pdf) =3D 973851e66d0d5ab095f444f8aeb966fefe2dd5442= 26395abbb110fc1b60f351d +SIZE (numpy-ref-1.8.1.pdf) =3D 5348248 +SHA256 (numpy-user-1.8.1.pdf) =3D be827f2d92ef86c3af7f59c623017e7bc23ee95c= 64f88e8c9871f3ad1f99b262 +SIZE (numpy-user-1.8.1.pdf) =3D 408305 Index: files/patch-numpy-f2py-f2py2e.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-numpy-f2py-f2py2e.py (revision 350423) +++ files/patch-numpy-f2py-f2py2e.py (working copy) @@ -1,10 +1,10 @@ ---- numpy/f2py/f2py2e.py.orig 2012-01-25 06:59:14.651304791 -0600 -+++ numpy/f2py/f2py2e.py 2012-01-25 07:00:58.475075133 -0600 +--- ./numpy/f2py/f2py2e.py.orig 2014-03-25 20:43:24.000000000 +0100 ++++ ./numpy/f2py/f2py2e.py 2014-04-09 17:57:26.264759349 +0200 @@ -520,6 +520,7 @@ include_dirs, sources =3D filter_files('-I', '', sources, remove_pref= ix=3D1) library_dirs, sources =3D filter_files('-L', '', sources, remove_pref= ix=3D1) libraries, sources =3D filter_files('-l', '', sources, remove_prefix= =3D1) -+ extra_link_args, sources =3D filter_files('-Wl,','',sources,remove_pr= efix=3D0) ++ extra_link_args, sources =3D filter_files('-Wl,|-B','',sources,remove= _prefix=3D0) undef_macros, sources =3D filter_files('-U', '', sources, remove_pref= ix=3D1) define_macros, sources =3D filter_files('-D', '', sources, remove_pre= fix=3D1) using_numarray =3D 0 --MP_/5ZTkypySqHskSo+YJWLqSTP-- --Sig_/nstPop8BxG1OOc8zcYZ1Att Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBAgAGBQJTTC+FAAoJELa5uPZMk+PSasgP/1C+eRvZDWMau28hLjsYNQI0 OfJQH8NLgW8azTJOofZnuwq8kws/sZL+hPJ02d6PRwYYZIIeUQcMkmSYypdKNYW2 kj3FxPSCSXLPVw33Zj3vHV5gfYRRjjkBzem8pIfys/i3YGQiiTklVFAJILNlYl1w lDg+msE59V7EQYGkvEbTyT3DPFhCcKX3l2PU4tHIpUNucYg3mOl6HnE8w+SdlWO2 cdcpdZszYqaKH55iHxP9tlm7rgJDtqxE8OAdE/Qzw+NR1V1npaVrQlsgCgUG7QUH hqkNzgRSvKFRSDrzFqtQFo2slj+pwE9EI3bEfaYneVbE9tZVNQNCpu5xsaQDQuue /n5I1PEFZtN4legmBFa/7B1CEIEYodaw9A5+d2Kje4Uufa3NGAya/ckJg80oPe+2 hQHJcZtEX2OMU8A5bvk/MgpB7JM3awpjib9cZ0I6sxlT8nHPKnk297GCE7y+hAKX KyUNdVNaYzrxi6YaQLhORqOLZhp8AFBjk8LUfxOgCO3JgfiRqjRlYCzz1/WiBT3M COmsj756dzijPASF3ujYDbe1I7P9CceUHJFEzc5n5SONKCNvwNjntLVZgb0TAQK5 yMS5aO8Ypde/+zaREi4sUkZCvdXhJ3MfrCYieeFvTSFFlPfPH1ooKKUmiO9+FkPA cqbl/NdWmo3PCTGFdC+C =tAuS -----END PGP SIGNATURE----- --Sig_/nstPop8BxG1OOc8zcYZ1Att--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140414205658.34ae32a0>