Fix for cross-compiling from Chromium OS.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

5 files changed, 83 insertions, 3 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index d630d9193954..b7af49ecc4d6 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.84 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.85 2015/05/15 09:03:31 vapier Exp $
+
+  15 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/m2crypto-0.21.1-cross-compile.patch,
+  +files/m2crypto-0.22.3-cross-compile.patch, m2crypto-0.21.1-r2.ebuild,
+  m2crypto-0.22.3-r3.ebuild:
+  Fix for cross-compiling from Chromium OS.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> m2crypto-0.21.1-r2.ebuild,
   m2crypto-0.22.3-r3.ebuild:
diff --git a/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
new file mode 100644
index 000000000000..647d93a43205
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
@@ -0,0 +1,29 @@
+https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
+
+--- a/setup.py
++++ b/setup.py
+@@ -52,14 +52,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         opensslIncludeDir = os.path.join(self.openssl, 'include')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+         
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir]]
++        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
+         self.swig_opts.append('-includeall')
+         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
+         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
+         
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]        
++        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+             
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -69,7 +67,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+                
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+ 
+ 
+ if sys.version_info < (2,4):
diff --git a/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
new file mode 100644
index 000000000000..ba3140473ae7
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
@@ -0,0 +1,41 @@
+https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
+
+--- a/setup.py
++++ b/setup.py
+@@ -68,25 +68,14 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        self.add_multiarch_paths()
+-
+         opensslIncludeDir = os.path.join(self.openssl, 'include')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
++        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+-        # Fedora does hat tricks.
+-        if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
+-            if platform.architecture()[0] == '64bit':
+-                self.swig_opts.append('-D__x86_64__')
+-            elif platform.architecture()[0] == '32bit':
+-                self.swig_opts.append('-D__i386__')
+-
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]
++        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+ 
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -96,8 +85,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+ 
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+-
+ if sys.platform == 'darwin':
+    my_extra_compile_args = ["-Wno-deprecated-declarations"]
+ else:
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
index 36fc5170dbcf..ce2e7d3cf2ae 100644
--- a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.3 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.4 2015/05/15 09:03:31 vapier Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 RESTRICT=test
 
 python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
 
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
index 38ef11d1c98b..2fa396af9531 100644
--- a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.2 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.3 2015/05/15 09:03:31 vapier Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 RESTRICT=test
 
 python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die