meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch
Mingli Yu 5b010f6358
python3-m2crypto: Upgrade 0.42.0 -> 0.44.0
Changelog: https://gitlab.com/m2crypto/m2crypto/-/tags

The cmd will be None after introduced the commit [1] in the new
version and result the below do_compile error.
 DEBUG: Executing shell function do_compile
 * Getting build dependencies for wheel...
 [snip]
 TypeError: expected str, bytes or os.PathLike object, not NoneType
 ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel

So make the cmd available to fix the above issue.

[1] 4d7880b019

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2025-03-28 10:28:12 -07:00

41 lines
1.4 KiB
Diff

From b14664fdab286485c5cbc0fbe5b0ff13f062edd8 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 7e295f3..cc414c9 100644
--- a/setup.py
+++ b/setup.py
@@ -221,7 +221,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()
--
2.34.1