diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /dev-python/numpy-python2 | |
parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) |
gentoo resync : 25.04.2020
Diffstat (limited to 'dev-python/numpy-python2')
-rw-r--r-- | dev-python/numpy-python2/Manifest | 3 | ||||
-rw-r--r-- | dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch | 23 | ||||
-rw-r--r-- | dev-python/numpy-python2/numpy-python2-1.16.5-r1.ebuild (renamed from dev-python/numpy-python2/numpy-python2-1.16.5.ebuild) | 3 |
3 files changed, 28 insertions, 1 deletions
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest index a66663246eca..cdc20390727a 100644 --- a/dev-python/numpy-python2/Manifest +++ b/dev-python/numpy-python2/Manifest @@ -1,7 +1,8 @@ AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae +AUX numpy-1.16.5-setup.py-install-skip-build-fails.patch 916 BLAKE2B 0745e076d4338b2591111c89183e6779c7461e73f4d9ec81b561fa6577da5840c268ce2ce5502d846d2a2e43ef74d4ce28be1dbd3fafee9ea955f81b8d3479db SHA512 f1708b76a7b1e308153b01f73bdf314d9a1fd7f57505bf0ed2da708097fdbc7735574520b99d32c76130e5bfef2bb74a45c683ef5f6b791dee153e29a8e87db2 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6 -EBUILD numpy-python2-1.16.5.ebuild 4396 BLAKE2B a9f374d911a9cba057d3b760f1b6dbbedf95df207ce5f0432a54130900d3de6ddea557d92caf254f16480410fe84bf0bb717e71501555dbf2d9a5174dd0299b0 SHA512 d3310d51c04a834955cd379e01ea7f59360dde06e0083d39c63fc825ed12928941b5ed37ed592d53afa39807c72527a658dfa51cd59fc7486dd45d55169cd05f +EBUILD numpy-python2-1.16.5-r1.ebuild 4548 BLAKE2B 412b7ba1b74525020e66d611bb810caf886868f4cd1ae595cc04e3cd19b74e0d413570231c8e01ab089f7edde125d7dd2b2430d7b2c7eda1e752e9041292b515 SHA512 b4df5ef3b38b556b0228844d080882e7d8201cc1718c69d7ee965b2586525b867a6417e7cf113dfb873aef0d69da52c61205fa3ef5f43e22c52db30a13671f18 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222 diff --git a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch new file mode 100644 index 000000000000..aa141de27f48 --- /dev/null +++ b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch @@ -0,0 +1,23 @@ +From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001 +From: mattip <matti.picus@gmail.com> +Date: Sun, 26 May 2019 08:55:53 +0300 +Subject: [PATCH] BUG: setup.py install --skip-build fails + +--- + numpy/distutils/command/install_clib.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py +index 662aa00bda9..6a73f7e3308 100644 +--- a/numpy/distutils/command/install_clib.py ++++ b/numpy/distutils/command/install_clib.py +@@ -19,6 +19,9 @@ def finalize_options(self): + + def run (self): + build_clib_cmd = get_cmd("build_clib") ++ if not build_clib_cmd.build_clib: ++ # can happen if the user specified `--skip-build` ++ build_clib_cmd.finalize_options() + build_dir = build_clib_cmd.build_clib + + # We need the compiler to get the library name -> filename association diff --git a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.5-r1.ebuild index d98d86246539..1eb5f203c4fe 100644 --- a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild +++ b/dev-python/numpy-python2/numpy-python2-1.16.5-r1.ebuild @@ -50,6 +50,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" PATCHES=( "${FILESDIR}"/${MY_PN}-1.15.4-no-hardcode-blas.patch + "${FILESDIR}"/numpy-1.16.5-setup.py-install-skip-build-fails.patch ) src_unpack() { @@ -150,6 +151,8 @@ sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" } python_install() { + # https://github.com/numpy/numpy/issues/16005 + local mydistutilsargs=( build_src ) distutils-r1_python_install ${NUMPY_FCONFIG} python_optimize } |