diff options
| author |   Gábor Oszkár Dénes <gaboroszkar@protonmail.com> | 2019-03-24 23:11:52 +0100 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2019-04-18 11:10:11 -0400 |
| commit | 63380ad8d37ce2a83a958f6bcc6b3d721fe2ff6d (patch) | |
| tree | 460729daaee2ddb9d0d3afdc83ff35e2dc4dd36f /dev-python | |
| parent | net-analyzer/netdata: 1.14.0 version bump (diff) | |
| download | gentoo-63380ad8d37ce2a83a958f6bcc6b3d721fe2ff6d.tar.gz gentoo-63380ad8d37ce2a83a958f6bcc6b3d721fe2ff6d.tar.bz2 gentoo-63380ad8d37ce2a83a958f6bcc6b3d721fe2ff6d.zip | |
dev-python/m2crypto: Fix crossdev
Fix crossdev in version 0.31.0-r2.
Closes: https://bugs.gentoo.org/665544
Closes: https://github.com/gentoo/gentoo/pull/11484
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Gábor Oszkár Dénes <gaboroszkar@protonmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch | 12 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild | 7 |
2 files changed, 16 insertions, 3 deletions
diff --git a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch new file mode 100644 index 000000000000..ff8388988ad1 --- /dev/null +++ b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -50,7 +50,8 @@ + '*Visual*', 'VC', 'include') + err = glob.glob(globmask) + else: +- pid = subprocess.Popen(['cpp', '-Wp,-v', '-'], ++ pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() + ++ ['-Wp,-v', '-'], + stdin=open(os.devnull, 'r'), + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild index 3d907ecee378..e3435d80ceb0 100644 --- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild +++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild @@ -25,7 +25,8 @@ RDEPEND=" libressl? ( dev-libs/libressl:0= ) virtual/python-typing[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-lang/swig-2.0.9 dev-python/setuptools[${PYTHON_USEDEP}] " @@ -37,18 +38,18 @@ RESTRICT=test PATCHES=( "${FILESDIR}/${PN}-libressl-${PV}.patch" + "${FILESDIR}/${PN}-crossdev-${PV}.patch" ) 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 - # TODO: Fix cross-compiles local -x SWIG_FEATURES= case ${ABI} in x32) SWIG_FEATURES="-D__ILP32__" ;; esac - distutils-r1_python_compile --openssl="${EPREFIX}"/usr + distutils-r1_python_compile --openssl="${ESYSROOT}"/usr } python_test() { |