mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
python3-m2crypto: update 0.40.1 -> 0.42.0
This addresses python 3.13 issues. Use build_meta instead of classic setuptools. Drop all setup.py patches as no longer necessary. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alexander Kanavin
Khem Raj
parent
4a78fcff7c
commit
0b3f4ed292
|
|
@ -1,28 +0,0 @@
|
|||
From 0d824e5c2ab13e761ffaeabdccf9513d5b8f280d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 8 Oct 2021 11:18:35 +0200
|
||||
Subject: [PATCH] setup.py: address openssl 3.x build issue
|
||||
|
||||
swig throws:
|
||||
| /home/alex/development/poky/build-metaoe/tmp/work/x86_64-linux/python3-m2crypto-native/0.38.0-r0/recipe-sysroot-native/usr/include/openssl/macros.h:155: Error: CPP #error ""OPENSSL_API_COMPAT expresses an impossible API compatibility level"". Use the -cpperraswarn option to continue swig processing.
|
||||
|
||||
I'm not sure why; upstream should take a look.
|
||||
|
||||
Upstream-Status: Inappropriate [workaround]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
setup.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 2c65404..74704bc 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -192,6 +192,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
|
||||
|
||||
self.swig_opts.append('-includeall')
|
||||
self.swig_opts.append('-modern')
|
||||
+ self.swig_opts.append('-cpperraswarn')
|
||||
self.swig_opts.append('-builtin')
|
||||
|
||||
# These two lines are a workaround for
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From dfb83a41aaeae326e9b6f02b233af375bc7b8815 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
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 <koen@dominion.thruhere.net>
|
||||
|
||||
Upstream-Status: Pending [Unknown]
|
||||
---
|
||||
setup.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -135,6 +135,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,
|
||||
@@ -159,8 +160,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)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
Filter out '/usr/include' for swig to avoid host contamination issue.
|
||||
|
||||
Upstream-Status: Inappropriate [cross compile specific]
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
setup.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 5a12981..389d49f 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -153,7 +153,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
|
||||
self.swig_opts.append('-py3')
|
||||
|
||||
# swig seems to need the default header file directories
|
||||
- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
|
||||
+ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()
|
||||
+ if i != '/usr/include'])
|
||||
|
||||
log.debug('self.include_dirs = %s', self.include_dirs)
|
||||
log.debug('self.library_dirs = %s', self.library_dirs)
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
Do not compute platform, this does not work in cross compile environment
|
||||
since it pokes at the system for getting architecture values
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -169,24 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_
|
||||
log.debug('self.include_dirs = %s', self.include_dirs)
|
||||
log.debug('self.library_dirs = %s', self.library_dirs)
|
||||
|
||||
- if platform.system() == "Linux":
|
||||
- # For RedHat-based distros, the '-D__{arch}__' option for
|
||||
- # Swig needs to be normalized, particularly on i386.
|
||||
- mach = platform.machine().lower()
|
||||
- if mach in ('i386', 'i486', 'i586', 'i686'):
|
||||
- arch = '__i386__'
|
||||
- elif mach in ('ppc64', 'powerpc64', 'ppc64le', 'ppc64el'):
|
||||
- arch = '__powerpc64__'
|
||||
- elif mach in ('ppc', 'powerpc'):
|
||||
- arch = '__powerpc__'
|
||||
- else:
|
||||
- arch = '__%s__' % mach
|
||||
- self.swig_opts.append('-D%s' % arch)
|
||||
- if mach in ('ppc64le', 'ppc64el'):
|
||||
- self.swig_opts.append('-D_CALL_ELF=2')
|
||||
- if mach in ('arm64_be'):
|
||||
- self.swig_opts.append('-D__AARCH64EB__')
|
||||
-
|
||||
self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
|
||||
|
||||
# Some Linux distributor has added the following line in
|
||||
|
|
@ -6,15 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e"
|
|||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/python-m2crypto:"
|
||||
|
||||
SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \
|
||||
file://cross-compile-platform.patch \
|
||||
file://avoid-host-contamination.patch \
|
||||
file://0001-setup.py-address-openssl-3.x-build-issue.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "bbfd113ec55708c05816252a4f09e4237df4f3bbfc8171cbbc33057d257bbb30"
|
||||
SRC_URI[sha256sum] = "42b62df2caf623161b1d643a7235464c2fe2a3105049ebc498a6d47dc08f64b4"
|
||||
|
||||
PYPI_PACKAGE = "M2Crypto"
|
||||
inherit pypi siteinfo setuptools3
|
||||
inherit pypi siteinfo python_setuptools_build_meta
|
||||
|
||||
DEPENDS += "openssl swig-native"
|
||||
RDEPENDS:${PN} += "\
|
||||
Loading…
Reference in New Issue
Block a user