From 470edc62b1821bcbb679bd3822acd98e9996c9e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 Feb 2025 14:09:30 -0800 Subject: [PATCH] python3-cffi: Fix failing ptests with clang MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Clang finds additional warnings with cffi generated code _CFFI_test_verify_anonymous_struct_with_star_typedef.cpp:587:10: error: non-constant-expression cannot be narrowed from type 'long' to 'size_t' (ak│a 'unsigned long') in initializer list [-Wc++11-narrowing] Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...ize_t-to-avoid-c-11-narrowing-warnin.patch | 34 +++++++++++++++++++ .../python/python3-cffi_1.17.1.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python3-cffi/0001-Cast-offset-to-size_t-to-avoid-c-11-narrowing-warnin.patch diff --git a/meta/recipes-devtools/python/python3-cffi/0001-Cast-offset-to-size_t-to-avoid-c-11-narrowing-warnin.patch b/meta/recipes-devtools/python/python3-cffi/0001-Cast-offset-to-size_t-to-avoid-c-11-narrowing-warnin.patch new file mode 100644 index 00000000000..a919f4f6fbf --- /dev/null +++ b/meta/recipes-devtools/python/python3-cffi/0001-Cast-offset-to-size_t-to-avoid-c-11-narrowing-warnin.patch @@ -0,0 +1,34 @@ +From 2ac63f8765e62f1492ef3ee06791636700bc6cfb Mon Sep 17 00:00:00 2001 +From: triallax +Date: Sat, 29 Jun 2024 15:25:24 +0100 +Subject: [PATCH] Cast offset to size_t to avoid c++11-narrowing warning (#92) + +e.g. with clang 18 on chimera linux: + +_CFFI_test_verify_anonymous_struct_with_star_typedef.cpp:583:10: error: non-constant-expression cannot be narrowed from type 'long' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] + 583 | { "a", ((char *)&((foo_t)4096)->a) - (char *)4096, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +_CFFI_test_verify_anonymous_struct_with_star_typedef.cpp:583:10: note: insert an explicit cast to silence this issue + 583 | { "a", ((char *)&((foo_t)4096)->a) - (char *)4096, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | static_cast( ) + +Upstream-Status: Backport [https://github.com/python-cffi/cffi/pull/92] +Signed-off-by: Khem Raj +--- + src/cffi/recompiler.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cffi/recompiler.py b/src/cffi/recompiler.py +index ac6c163e..14d578ee 100644 +--- a/src/cffi/recompiler.py ++++ b/src/cffi/recompiler.py +@@ -953,7 +953,7 @@ class Recompiler: + if cname is None or fbitsize >= 0: + offset = '(size_t)-1' + elif named_ptr is not None: +- offset = '((char *)&((%s)4096)->%s) - (char *)4096' % ( ++ offset = '(size_t)(((char *)&((%s)4096)->%s) - (char *)4096)' % ( + named_ptr.name, fldname) + else: + offset = 'offsetof(%s, %s)' % (tp.get_c_name(''), fldname) diff --git a/meta/recipes-devtools/python/python3-cffi_1.17.1.bb b/meta/recipes-devtools/python/python3-cffi_1.17.1.bb index fbe9051a90b..5a3af03d9f6 100644 --- a/meta/recipes-devtools/python/python3-cffi_1.17.1.bb +++ b/meta/recipes-devtools/python/python3-cffi_1.17.1.bb @@ -6,7 +6,8 @@ DEPENDS += "libffi python3-pycparser" SRC_URI[sha256sum] = "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824" -SRC_URI += "file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-Cast-offset-to-size_t-to-avoid-c-11-narrowing-warnin.patch" inherit pypi python_setuptools_build_meta ptest pkgconfig -- 2.47.3