commit: d2a02b28d0a6e69cecefae8c2f93adef20ccbfe3 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Aug 14 19:36:01 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Aug 14 19:36:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a02b28
dev-python/m2crypto: fix build on armhf Closes: https://bugs.gentoo.org/674112 Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild | 22 +++++++++++++++++----- dev-python/m2crypto/m2crypto-0.35.2.ebuild | 22 +++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild index 17cac8b10d3..c88a6032975 100644 --- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild +++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5..7}) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs MY_PN="M2Crypto" @@ -41,14 +41,26 @@ PATCHES=( "${FILESDIR}/${PN}-crossdev-${PV}.patch" ) +swig_define() { + local x + for x; do + if tc-cpp-is-true "defined(${x})"; then + SWIG_FEATURES+=" -D${x}" + fi + done +} + python_compile() { # setup.py looks at platform.machine() to determine swig options. # For exotic ABIs, we need to give swig a hint. - # https://bugs.gentoo.org/617946 local -x SWIG_FEATURES= - case ${ABI} in - x32) SWIG_FEATURES="-D__ILP32__" ;; - esac + + # https://bugs.gentoo.org/617946 + swig_define __ILP32__ + + # https://bugs.gentoo.org/674112 + swig_define __ARM_PCS_VFP + distutils-r1_python_compile --openssl="${ESYSROOT}"/usr } diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild index 986af95f307..86b01947387 100644 --- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild +++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5..7}) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 toolchain-funcs MY_PN="M2Crypto" DESCRIPTION="A Python crypto and SSL toolkit" @@ -35,14 +35,26 @@ PATCHES=( "${FILESDIR}/${PN}-libressl-0.31.0.patch" ) +swig_define() { + local x + for x; do + if tc-cpp-is-true "defined(${x})"; then + SWIG_FEATURES+=" -D${x}" + fi + done +} + python_compile() { # setup.py looks at platform.machine() to determine swig options. # For exotic ABIs, we need to give swig a hint. - # https://bugs.gentoo.org/617946 local -x SWIG_FEATURES= - case ${ABI} in - x32) SWIG_FEATURES="-D__ILP32__" ;; - esac + + # https://bugs.gentoo.org/617946 + swig_define __ILP32__ + + # https://bugs.gentoo.org/674112 + swig_define __ARM_PCS_VFP + distutils-r1_python_compile --openssl="${ESYSROOT}"/usr }
