Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- ...-directory-when-cross-compiling-9129.patch | 52 +++++++++++++++++++ ...i-substitute-include-path-from-targe.patch | 29 ----------- .../python/python3-cryptography_41.0.1.bb | 2 +- 3 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch delete mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch
diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch new file mode 100644 index 00000000000..d720359ded7 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch @@ -0,0 +1,52 @@ +From 2f9cd402d3293f6efe0f3ac06f17c6c14edbed86 Mon Sep 17 00:00:00 2001 +From: James Hilliard <james.hillia...@gmail.com> +Date: Sun, 25 Jun 2023 17:39:19 -0600 +Subject: [PATCH] Fix include directory when cross compiling (#9129) + +Upstream-Status: Backport [https://github.com/pyca/cryptography/pull/9129] +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/rust/cryptography-cffi/build.rs | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs +index 07590ad2e..384af1ddb 100644 +--- a/src/rust/cryptography-cffi/build.rs ++++ b/src/rust/cryptography-cffi/build.rs +@@ -47,9 +47,14 @@ fn main() { + ) + .unwrap(); + println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); +- let python_include = run_python_script( ++ let python_includes = run_python_script( + &python, +- "import sysconfig; print(sysconfig.get_path('include'), end='')", ++ "import os; \ ++ import setuptools.dist; \ ++ import setuptools.command.build_ext; \ ++ b = setuptools.command.build_ext.build_ext(setuptools.dist.Distribution()); \ ++ b.finalize_options(); \ ++ print(os.pathsep.join(b.include_dirs), end='')", + ) + .unwrap(); + let openssl_include = +@@ -59,12 +64,15 @@ fn main() { + let mut build = cc::Build::new(); + build + .file(openssl_c) +- .include(python_include) + .include(openssl_include) + .flag_if_supported("-Wconversion") + .flag_if_supported("-Wno-error=sign-conversion") + .flag_if_supported("-Wno-unused-parameter"); + ++ for python_include in env::split_paths(&python_includes) { ++ build.include(python_include); ++ } ++ + // Enable abi3 mode if we're not using PyPy. + if python_impl != "PyPy" { + // cp37 (Python 3.7 to help our grep when we some day drop 3.7 support) +-- +2.30.2 + diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch b/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch deleted file mode 100644 index 1a60abada79..00000000000 --- a/meta/recipes-devtools/python/python3-cryptography/0001-cryptography-cffi-substitute-include-path-from-targe.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 04aac6c88152088778c6551dfa86b2fc446dc61c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <a...@linutronix.de> -Date: Mon, 19 Jun 2023 13:27:28 +0200 -Subject: [PATCH] cryptography-cffi: substitute include path from target - sysroot - -Upstream-Status: Accepted [https://github.com/pyca/cryptography/pull/9105] - -Signed-off-by: Alexander Kanavin <a...@linutronix.de> ---- - src/rust/cryptography-cffi/build.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs -index 4a40990..08abb95 100644 ---- a/src/rust/cryptography-cffi/build.rs -+++ b/src/rust/cryptography-cffi/build.rs -@@ -48,7 +48,7 @@ fn main() { - println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); - let python_include = run_python_script( - &python, -- "import sysconfig; print(sysconfig.get_path('include'), end='')", -+ "import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'), end='')", - ) - .unwrap(); - let openssl_include = --- -2.30.2 - diff --git a/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb index fc4f70246be..494ca233f00 100644 --- a/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb +++ b/meta/recipes-devtools/python/python3-cryptography_41.0.1.bb @@ -11,7 +11,7 @@ LDSHARED += "-pthread" SRC_URI[sha256sum] = "d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006" SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://0001-cryptography-cffi-substitute-include-path-from-targe.patch \ + file://0001-Fix-include-directory-when-cross-compiling-9129.patch \ file://check-memfree.py \ file://run-ptest \ " -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183590): https://lists.openembedded.org/g/openembedded-core/message/183590 Mute This Topic: https://lists.openembedded.org/mt/99832333/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
