commit: 20864badf63654f1105ad6b976dc4500332bf36e Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Mon Jul 10 21:32:00 2017 +0000 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> CommitDate: Tue Jul 11 20:20:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20864bad
dev-python/numpy: non-parallel build with python3 Affect only non ccache users, and with USE=-lapack See https://bugs.gentoo.org/show_bug.cgi?id=623790. Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-python/numpy/Manifest | 1 - dev-python/numpy/numpy-1.13.0.ebuild | 163 ----------------------------------- dev-python/numpy/numpy-1.13.1.ebuild | 6 +- 3 files changed, 4 insertions(+), 166 deletions(-) diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 6898e73c635..ea805cd459c 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,6 +1,5 @@ DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d -DIST numpy-1.13.0.zip 5009537 SHA256 dcff367b725586830ff0e20b805c7654c876c2d4585c0834a6049502b9d6cf7e SHA512 01b1ad231b8ff20192e17a13454fa2b481043f3440012fc274de6369a0338a148585831ccf6e03efc2dc94ee6e5a2c78808d66b76ec6413505d98f50e5db90bd WHIRLPOOL 089139703055c4290852df7a1945f9d17164b597df762d17a4c42962cc8f3fe6625114d865a34b3f96e084ae9469839505a177b8ae099e359dfcdd26a6650797 DIST numpy-1.13.1.zip 5012881 SHA256 c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb SHA512 bfa97ca4f958b04c158a4bcaa366ec2645c972654bd65fb20c287806f40fb7a04b8cc1f1cefb350d477488a93029d75a9f06d01c300cfb1805dd10819a631c43 WHIRLPOOL 9553d157f297c2bf385f16290f7596913d59ba30077a82ff7fa2969f87ea9ba57f88d38cec42aa9a81c4a15096ac0aeb4c409f42fa4b714a9cb45ee904c1bdf0 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 diff --git a/dev-python/numpy/numpy-1.13.0.ebuild b/dev-python/numpy/numpy-1.13.0.ebuild deleted file mode 100644 index 37935752d33..00000000000 --- a/dev-python/numpy/numpy-1.13.0.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads(+)" - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator - -DOC_PV="1.13.0" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://www.numpy.org/"; -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${P}.zip - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.11.0 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.1-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - cat >> site.cfg <<-EOF || die - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die - - # we don't have f2py-3.3 - sed \ - -e 's:test_f2py:_&:g' \ - -i numpy/tests/test_scripts.py || die - - # QA bug 590464 - # The .py files from numpy/core/tests are just added, instead - # of being bytecode compiled as a proper subdir package. - # We trick the buildsystem into accepting it as a bytecode - # package by adding a setup.py and an empty __init__.py - #cp numpy/{compat/setup.py,core/tests} || die - #touch numpy/core/tests/__init__.py || die - #sed \ - # -e 's:compat:tests:' \ - # -i numpy/core/tests/setup.py || die - #sed \ - # -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \ - # -i numpy/core/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile \ - $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \ - ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - DOCS+=( THANKS.txt ) - - if use doc; then - HTML_DOCS=( "${WORKDIR}"/html/. ) - DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf ) - fi - - distutils-r1_python_install_all - - docinto f2py - dodoc doc/f2py/*.txt - doman doc/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.13.1.ebuild b/dev-python/numpy/numpy-1.13.1.ebuild index 37935752d33..3fde5c7bc3d 100644 --- a/dev-python/numpy/numpy-1.13.1.ebuild +++ b/dev-python/numpy/numpy-1.13.1.ebuild @@ -30,8 +30,8 @@ IUSE="doc lapack test" RDEPEND="lapack? ( virtual/cblas virtual/lapack )" DEPEND="${RDEPEND} + app-arch/unzip dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( app-arch/unzip ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" @@ -127,8 +127,10 @@ python_prepare_all() { } python_compile() { + local python_makeopts_jobs="" + python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" distutils-r1_python_compile \ - $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \ + ${python_makeopts_jobs} \ ${NUMPY_FCONFIG} }
