From cf7630078a53ff74b245b148bd722994068e28f9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Oct 2022 15:59:37 +0100 Subject: gentoo auto-resync : 28:10:2022 - 15:59:37 --- dev-python/pythran/Manifest | 3 +- .../pythran/files/pythran-0.12.0-gcc13.patch | 36 ++++++++++++ dev-python/pythran/pythran-0.12.0-r1.ebuild | 65 --------------------- dev-python/pythran/pythran-0.12.0-r2.ebuild | 66 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 66 deletions(-) create mode 100644 dev-python/pythran/files/pythran-0.12.0-gcc13.patch delete mode 100644 dev-python/pythran/pythran-0.12.0-r1.ebuild create mode 100644 dev-python/pythran/pythran-0.12.0-r2.ebuild (limited to 'dev-python/pythran') diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest index 915fa8d39ee3..ccfefa0148b3 100644 --- a/dev-python/pythran/Manifest +++ b/dev-python/pythran/Manifest @@ -1,7 +1,8 @@ AUX pythran-0.10.0-tests-werror.patch 480 BLAKE2B ac7b6fe2cd4b4aeed3be4baf2a433ff48ae9e2bedc7be70c04122bf097906480e57d077ed485e0e47c6414d390e64fdef47d5ef77a890af99403defcc43b0bc8 SHA512 e699298e03b5d0e868aa2704100f47368baf2477c4f3632d97f1c65af0ff6babbbecab3c083f09f09353194dedc3b77b653b1b8ae9ac7967ebc65c8932bf8bdf +AUX pythran-0.12.0-gcc13.patch 1472 BLAKE2B f385cfd607a77a72fd5815502416b267342dc6d9307b5d6974ea4a5188233b19efaf389fa90051b9435130a63aa892870a9d573d3c7f50a5cdf83b034a15d3d1 SHA512 b42398b068da7fbe35e9f8fdf76579102347f63f63b94ed2db1966b15e3ff53c26a1a015a8a5a53a36d4e0cd1ed4689f9f4fae120741dd6804fc9a3adc78404a DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1 DIST pythran-0.12.0.gh.tar.gz 3589256 BLAKE2B 5eeba4b7d73e56cc2b696098edb085e11d406485960614b50426e3df7c425ad22537ae72a2931a9ec318ab23153660da543ec1890f03379981eee10a34b82cea SHA512 8f698cb2efc8e53005a6a18b81b9119796d56e638c4634d3a9268bc8d4ac340c7ff1a26212f17210ad7200eb8a3e0f9dd20702d9d9c51f24a76dadc7d0877693 EBUILD pythran-0.11.0.ebuild 1216 BLAKE2B 3bbdd186dec832ba93efc8681b36738f28779b6b30068b27309ce7a3701a15a95387e56878bf77aa7f7ecbd316328dc9d815178a2c471e0441bf12ca5deb86bd SHA512 78fdf9b66ddf94d3513a2a07203ac1274e9d1dc928afabea0a573e47716006606a5ae38c372a98c7e601195080bd876a3bb816e74c3aaaa49b9f3f56f106ea87 -EBUILD pythran-0.12.0-r1.ebuild 1438 BLAKE2B 8e9886ec0cf6b2f7e51d32abebf8c4d718c7722537a0d29a887a8ed1f29ded7e8fe160f517213a304ec0b24e628b494ea60549220285629b1194b8052bcf83e8 SHA512 08a540208a25712104cfc21668f972fa1eaa021d02e1e1980ae3576415f3ec08dce71f5296127295e687a154c0932649ad60ad0743c9a65e5e530252c94ce49d +EBUILD pythran-0.12.0-r2.ebuild 1478 BLAKE2B 3548ddd74816e938f39338d2c0b258595f49581fe80f2afdce6b0f07b3968c38410b531618500e147e2aae58078738f9a750dd361140af681830a51bb892070a SHA512 ae94645859d96d389e04ef9918a40c9793fec41f9f6fd0c2d64133d754bd5e1628945528c148ef1000f8d36e00a6e7f8480ebe246c5dba2bce501568b3fbcee6 EBUILD pythran-0.12.0.ebuild 1190 BLAKE2B ef04054cb343d9a3c3e0bdc5fe2f6c41aef90bef6cb2eaf2d3fbadf35430677072a45e0888fc05a8874bfe6b61bb799b0cf9b86a93fc493e95a5e1c6e95dcce1 SHA512 794a5d327f8c9aeea34cdccd596726c7084a14e8a9a9af7ec604afad6f602409b814eac6fb042a7a8a8626a38a5e1e3aadcaa531d0233bcefccffe3647312dfd MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f diff --git a/dev-python/pythran/files/pythran-0.12.0-gcc13.patch b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch new file mode 100644 index 000000000000..d7b9f28f0f45 --- /dev/null +++ b/dev-python/pythran/files/pythran-0.12.0-gcc13.patch @@ -0,0 +1,36 @@ +https://github.com/serge-sans-paille/pythran/pull/2029 + +From 13a89edad477077331ae8071eadf239e88adea0c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 28 Oct 2022 12:47:35 +0100 +Subject: [PATCH] Fix build with GCC 13 (missing include) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building scipy, one gets: +``` +/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:304:17: error: ‘uint8_t’ was not declared in this scope + 304 | SCALAR_COMBINER(uint8_t) + | ^~~~~~~ +/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:300:21: note: in definition of macro ‘SCALAR_COMBINER’ + 300 | struct __combined { \ + | ^~~~ +/usr/lib/python3.10/site-packages/pythran/pythonic/include/types/combined.hpp:5:1: note: ‘uint8_t’ is defined in header ‘’; did you forget to ‘#include ’? + 4 | #include "pythonic/include/types/traits.hpp" + +++ |+#include +``` + +Bug: https://bugs.gentoo.org/878527 +--- a/pythran/pythonic/include/types/combined.hpp ++++ b/pythran/pythonic/include/types/combined.hpp +@@ -1,6 +1,8 @@ + #ifndef PYTHONIC_INCLUDE_TYPES_COMBINED_HPP + #define PYTHONIC_INCLUDE_TYPES_COMBINED_HPP + ++#include ++ + #include "pythonic/include/types/traits.hpp" + PYTHONIC_NS_BEGIN + namespace types + diff --git a/dev-python/pythran/pythran-0.12.0-r1.ebuild b/dev-python/pythran/pythran-0.12.0-r1.ebuild deleted file mode 100644 index 585d64925bd1..000000000000 --- a/dev-python/pythran/pythran-0.12.0-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{8..10} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 ) - -inherit distutils-r1 multiprocessing - -MY_P=${P/_p/.post} -DESCRIPTION="Ahead of Time compiler for numeric kernels" -HOMEPAGE=" - https://pypi.org/project/pythran/ - https://github.com/serge-sans-paille/pythran/ -" -SRC_URI=" - https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86" - -RDEPEND=" - dev-libs/boost - =dev-python/beniget-0.4*[${PYTHON_USEDEP}] - =dev-python/gast-0.5*[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/ply-3.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - $(python_gen_cond_dep ' - dev-python/ipython[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/cblas - !!dev-python/setuptools-declarative-requirements - ) -" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch -) - -src_configure() { - # TODO: package xsimd then set no_xsimd = True - cat >> setup.cfg <<-EOF - [build_py] - no_boost = True - EOF -} - -python_test() { - local -x COLUMNS=80 - epytest -n "$(makeopts_jobs)" -} diff --git a/dev-python/pythran/pythran-0.12.0-r2.ebuild b/dev-python/pythran/pythran-0.12.0-r2.ebuild new file mode 100644 index 000000000000..3a8d913b453c --- /dev/null +++ b/dev-python/pythran/pythran-0.12.0-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{8..10} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 ) + +inherit distutils-r1 multiprocessing + +MY_P=${P/_p/.post} +DESCRIPTION="Ahead of Time compiler for numeric kernels" +HOMEPAGE=" + https://pypi.org/project/pythran/ + https://github.com/serge-sans-paille/pythran/ +" +SRC_URI=" + https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86" + +RDEPEND=" + dev-libs/boost + =dev-python/beniget-0.4*[${PYTHON_USEDEP}] + =dev-python/gast-0.5*[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/ply-3.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/ipython[${PYTHON_USEDEP}] + ' "${PYTHON_TESTED[@]}") + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + virtual/cblas + !!dev-python/setuptools-declarative-requirements + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${PN}-0.10.0-tests-werror.patch + "${FILESDIR}"/${PN}-0.12.0-gcc13.patch +) + +src_configure() { + # TODO: package xsimd then set no_xsimd = True + cat >> setup.cfg <<-EOF + [build_py] + no_boost = True + EOF +} + +python_test() { + local -x COLUMNS=80 + epytest -n "$(makeopts_jobs)" +} -- cgit v1.2.3