From b8bbcd4dea422be57123d75fbf77db6d33542b06 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 May 2021 12:04:27 -0700 Subject: python3-m2crypto: Upgrade to 0.37.1 Unifiy .inc into .bb Add patches to fix issues with openssl 1.1.x Remove m2crypto-0.26.4-gcc_macros patch, its no longer needed Refresh existing patches Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- ...y-link-in-sysroot-not-in-host-directories.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch (limited to 'meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch') diff --git a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch deleted file mode 100644 index b339d93f75..0000000000 --- a/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 29 Mar 2013 15:17:17 +0100 -Subject: [PATCH] setup.py: link in sysroot, not in host directories - -Signed-off-by: Koen Kooi - -Upstream-status: Unknown ---- - setup.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: M2Crypto-0.30.1/setup.py -=================================================================== ---- M2Crypto-0.30.1.orig/setup.py -+++ M2Crypto-0.30.1/setup.py -@@ -130,6 +130,7 @@ class _M2CryptoBuildExt(build_ext.build_ - self.set_undefined_options('build', ('bundledlls', 'bundledlls')) - - self.libraries = ['ssl', 'crypto'] -+ self.openssl = os.environ.get( "STAGING_DIR" ) - if sys.platform == 'win32': - self.libraries = ['ssleay32', 'libeay32'] - if self.openssl and openssl_version(self.openssl, 0x10100000, True): -@@ -150,8 +151,8 @@ class _M2CryptoBuildExt(build_ext.build_ - - if self.openssl is not None: - log.debug('self.openssl = %s', self.openssl) -- openssl_library_dir = os.path.join(self.openssl, 'lib') -- openssl_include_dir = os.path.join(self.openssl, 'include') -+ openssl_library_dir = os.environ.get( "STAGING_LIBDIR" ) -+ openssl_include_dir = os.environ.get( "STAGING_INCDIR" ) - - self.library_dirs.append(openssl_library_dir) - self.include_dirs.append(openssl_include_dir) -- cgit v1.2.3-54-g00ecf