python-m2crypt: update package to 0.23.0
PATCH 1/1 python-m2crypt: update package to 0.23.0
this happens to fix the cdra build issue related to the openssl 1.0.2g update.
Signed-off-by Armin Kuster <[email protected]>
--- ...y-link-in-sysroot-not-in-host-directories.patch | 35 ++++++++--------- .../python/python-m2crypto_0.21.1.bb | 44 ---------------------- .../python/python-m2crypto_0.23.0.bb | 30 +++++++++++++++ 3 files changed, 46 insertions(+), 63 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb create mode 100644 meta-python/recipes-devtools/python/python-m2crypto_0.23.0.bb
meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +16 -19
@@ -10,30 +10,27 @@ Upstream-status: Unknown setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/setup.py b/setup.py -index e7c49eb..8deaa34 100644 ---- a/setup.py -+++ b/setup.py -@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): +Index: M2Crypto-0.23.0/setup.py +=================================================================== +--- M2Crypto-0.23.0.orig/setup.py ++++ M2Crypto-0.23.0/setup.py +@@ -62,7 +62,7 @@ class _M2CryptoBuildExt(build_ext.build_ self.openssl = 'c:\\pkg' else: self.libraries = ['ssl', 'crypto'] - self.openssl = '/usr' + self.openssl = os.environ.get( "STAGING_DIR" ) - - + def finalize_options(self): -@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): + '''Overloaded build_ext implementation to append custom openssl +@@ -75,8 +75,8 @@ class _M2CryptoBuildExt(build_ext.build_ + if _openssl and os.path.isdir(_openssl): + self.openssl = _openssl - build_ext.build_ext.finalize_options(self) +- self.include_dirs.append(os.path.join(self.openssl, 'include')) +- openssl_library_dir = os.path.join(self.openssl, 'lib') ++ self.include_dirs.append(os.environ.get( "STAGING_INCDIR" )) ++ openssl_library_dir = os.environ.get( "STAGING_LIBDIR" ) -- opensslIncludeDir = os.path.join(self.openssl, 'include') -- opensslLibraryDir = os.path.join(self.openssl, 'lib') -+ opensslIncludeDir = os.environ.get( "STAGING_INCDIR" ) -+ opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" ) - - self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ - [opensslIncludeDir]] --- -1.8.1.4 - + if platform.system() == "Linux": + if _multiarch: # on Fedora/RHEL it is an empty string
meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb deleted +0 -44
44 lines not on this page · raw message
meta-python/recipes-devtools/python/python-m2crypto_0.23.0.bb new file +30 -0
@@ -0,0 +1,30 @@ +SUMMARY = "A Python crypto and SSL toolkit" +HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=68f7880de949412b2ea248932d97ed54" + +SRCNAME = "M2Crypto" +SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz" + +SRC_URI[md5sum] = "89557730e245294a6cab06de8ad4fb42" +SRC_URI[sha256sum] = "1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f" + +SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch " + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +DEPENDS += "openssl swig-native" + +DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" +DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}" + +inherit setuptools + +SWIG_FEATURES_x86-64 = "-D__x86_64__" +SWIG_FEATURES ?= "" +export SWIG_FEATURES + +BBCLASSEXTEND = "native"
Signature · 1 line
2.3.5