1 files changed, 16 insertions, 9 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
index c4262985ba..12216ce46a 100644
--- 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
@@ -1,4 +1,4 @@
-From eaeb95ec64762a58dde7cf368fc17188382e7df6 Mon Sep 17 00:00:00 2001
+From 6262f49de177a79bc17f8d583aa5a7acaf48bf9c 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
@@ -19,19 +19,26 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 9938e67..21e2346 100644
+index 792d7365b6ed..5b8a5d791793 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'))]
+@@ -208,8 +208,10 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         if sys.platform != "win32":
+             # generate src/SWIG/x509_v_flag.h to overcome weaknesses of swig
+             # https://todo.sr.ht/~mcepl/m2crypto/298
+-            with open("src/SWIG/x509_v_flag.h", "w", encoding="utf-8") as x509_v_h:
+-                cmd = [shutil.which(os.environ.get("CC", "gcc"))]
++            with open(
++                "src/SWIG/x509_v_flag.h", "w", encoding="utf-8"
++            ) as x509_v_h:
 +                cmd = os.environ.get('CC', 'gcc').split()
                  cflags = os.environ.get("CFLAGS")
                  if cflags is not None:
                      cmd += cflags.split()
+-- 
+2.34.1
+