| 1 |
commit: 63380ad8d37ce2a83a958f6bcc6b3d721fe2ff6d |
| 2 |
Author: Gábor Oszkár Dénes <gaboroszkar <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 24 22:11:52 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 18 15:10:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63380ad8 |
| 7 |
|
| 8 |
dev-python/m2crypto: Fix crossdev |
| 9 |
|
| 10 |
Fix crossdev in version 0.31.0-r2. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/665544 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/11484 |
| 14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 15 |
Signed-off-by: Gábor Oszkár Dénes <gaboroszkar <AT> protonmail.com> |
| 16 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch | 12 ++++++++++++ |
| 19 |
dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild | 7 ++++--- |
| 20 |
2 files changed, 16 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..ff8388988ad |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch |
| 27 |
@@ -0,0 +1,12 @@ |
| 28 |
+--- a/setup.py |
| 29 |
++++ b/setup.py |
| 30 |
+@@ -50,7 +50,8 @@ |
| 31 |
+ '*Visual*', 'VC', 'include') |
| 32 |
+ err = glob.glob(globmask) |
| 33 |
+ else: |
| 34 |
+- pid = subprocess.Popen(['cpp', '-Wp,-v', '-'], |
| 35 |
++ pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() + |
| 36 |
++ ['-Wp,-v', '-'], |
| 37 |
+ stdin=open(os.devnull, 'r'), |
| 38 |
+ stdout=subprocess.PIPE, |
| 39 |
+ stderr=subprocess.PIPE) |
| 40 |
|
| 41 |
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild |
| 42 |
index 3d907ecee37..e3435d80ceb 100644 |
| 43 |
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild |
| 44 |
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild |
| 45 |
@@ -25,7 +25,8 @@ RDEPEND=" |
| 46 |
libressl? ( dev-libs/libressl:0= ) |
| 47 |
virtual/python-typing[${PYTHON_USEDEP}] |
| 48 |
" |
| 49 |
-DEPEND="${RDEPEND} |
| 50 |
+DEPEND="${RDEPEND}" |
| 51 |
+BDEPEND=" |
| 52 |
>=dev-lang/swig-2.0.9 |
| 53 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 54 |
" |
| 55 |
@@ -37,18 +38,18 @@ RESTRICT=test |
| 56 |
|
| 57 |
PATCHES=( |
| 58 |
"${FILESDIR}/${PN}-libressl-${PV}.patch" |
| 59 |
+ "${FILESDIR}/${PN}-crossdev-${PV}.patch" |
| 60 |
) |
| 61 |
|
| 62 |
python_compile() { |
| 63 |
# setup.py looks at platform.machine() to determine swig options. |
| 64 |
# For exotic ABIs, we need to give swig a hint. |
| 65 |
# https://bugs.gentoo.org/617946 |
| 66 |
- # TODO: Fix cross-compiles |
| 67 |
local -x SWIG_FEATURES= |
| 68 |
case ${ABI} in |
| 69 |
x32) SWIG_FEATURES="-D__ILP32__" ;; |
| 70 |
esac |
| 71 |
- distutils-r1_python_compile --openssl="${EPREFIX}"/usr |
| 72 |
+ distutils-r1_python_compile --openssl="${ESYSROOT}"/usr |
| 73 |
} |
| 74 |
|
| 75 |
python_test() { |
Archives