From a6cae12e1c2ae09fcb4273a082b18e2c75ac9f65 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 28 Oct 2022 12:59:46 +0000 Subject: Adding metadata --- .../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 ++++++++++++++++++++++ 3 files changed, 102 insertions(+), 65 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/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 7a08fe3b235e..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_{7,8,9,10,11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -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..0d5374a6d66d --- /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_{7,8,9,10,11} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) + +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.3