5 files changed, 37 insertions, 117 deletions

diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
new file mode 100644
index 0000000000..c4262985ba
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
@@ -0,0 +1,37 @@
+From eaeb95ec64762a58dde7cf368fc17188382e7df6 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Fri, 28 Mar 2025 12:13:26 +0800
+Subject: [PATCH] setup.py: Make the cmd available
+
+The cmd will be None in OE environment as below.
+ >>> import os
+ >>> os.environ.get('CC', 'gcc')
+'x86_64-wrs-linux-gcc  -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/buildarea/tmp/work/corei7-64-wrs-linux/python3-m2crypto/0.44.0/recipe-sysroot'
+ >>> import shutil
+ >>> shutil.which(os.environ.get('CC', 'gcc'))
+ >>> cmd = [shutil.which(os.environ.get('CC', 'gcc'))]
+ >>> print(cmd)
+[None]
+
+So change the check logic to get the expected cmd.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9938e67..21e2346 100644
+--- a/setup.py
++++ b/setup.py
+@@ -230,7 +230,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             with open(
+                 "src/SWIG/x509_v_flag.h", "w", encoding="utf-8"
+             ) as x509_v_h:
+-                cmd = [shutil.which(os.environ.get('CC', 'gcc'))]
++                cmd = os.environ.get('CC', 'gcc').split()
+                 cflags = os.environ.get("CFLAGS")
+                 if cflags is not None:
+                     cmd += cflags.split()
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch
deleted file mode 100644
index c67e50803b..0000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-address-openssl-3.x-build-issue.patch
+++ /dev/null
@@ -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
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
deleted file mode 100644
index 0baadfcaa5..0000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
+++ /dev/null
@@ -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)
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch b/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch
deleted file mode 100644
index 3cd6f7c276..0000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch
+++ /dev/null
@@ -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)
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch b/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
deleted file mode 100644
index 77ef7e557e..0000000000
--- a/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch
+++ /dev/null
@@ -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