diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-02-27 09:51:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-29 10:26:13 +0000 |
commit | e5e6d6fe9a12318c12c5ece5e9efecaf24969a85 (patch) | |
tree | d2a6ca70d6cfe93fef21eacface7a3d7085e0389 /meta/recipes-devtools/python | |
parent | 7bdf0d486915078eeb8dabe0153c023cb6fc3485 (diff) | |
download | poky-e5e6d6fe9a12318c12c5ece5e9efecaf24969a85.tar.gz |
python3-bcrypt: Fix build break on arches without 64 bit atomics
bump pyo3 to 0.20.3, which brings the needed fixes for building for
architectures without 64bit atomics [1]
[1] https://github.com/pyca/bcrypt/pull/746
(From OE-Core rev: 33bd36308be828123a820c5eed2f1fa9e3a7c0f6)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
3 files changed, 124 insertions, 10 deletions
diff --git a/meta/recipes-devtools/python/python3-bcrypt-crates.inc b/meta/recipes-devtools/python/python3-bcrypt-crates.inc index 5db6d1e96e..0e7479f0b5 100644 --- a/meta/recipes-devtools/python/python3-bcrypt-crates.inc +++ b/meta/recipes-devtools/python/python3-bcrypt-crates.inc | |||
@@ -27,12 +27,13 @@ SRC_URI += " \ | |||
27 | crate://crates.io/parking_lot/0.12.1 \ | 27 | crate://crates.io/parking_lot/0.12.1 \ |
28 | crate://crates.io/parking_lot_core/0.9.9 \ | 28 | crate://crates.io/parking_lot_core/0.9.9 \ |
29 | crate://crates.io/pbkdf2/0.12.2 \ | 29 | crate://crates.io/pbkdf2/0.12.2 \ |
30 | crate://crates.io/portable-atomic/1.6.0 \ | ||
30 | crate://crates.io/proc-macro2/1.0.70 \ | 31 | crate://crates.io/proc-macro2/1.0.70 \ |
31 | crate://crates.io/pyo3/0.20.0 \ | 32 | crate://crates.io/pyo3/0.20.3 \ |
32 | crate://crates.io/pyo3-build-config/0.20.0 \ | 33 | crate://crates.io/pyo3-build-config/0.20.3 \ |
33 | crate://crates.io/pyo3-ffi/0.20.0 \ | 34 | crate://crates.io/pyo3-ffi/0.20.3 \ |
34 | crate://crates.io/pyo3-macros/0.20.0 \ | 35 | crate://crates.io/pyo3-macros/0.20.3 \ |
35 | crate://crates.io/pyo3-macros-backend/0.20.0 \ | 36 | crate://crates.io/pyo3-macros-backend/0.20.3 \ |
36 | crate://crates.io/quote/1.0.33 \ | 37 | crate://crates.io/quote/1.0.33 \ |
37 | crate://crates.io/redox_syscall/0.4.1 \ | 38 | crate://crates.io/redox_syscall/0.4.1 \ |
38 | crate://crates.io/scopeguard/1.2.0 \ | 39 | crate://crates.io/scopeguard/1.2.0 \ |
@@ -82,12 +83,13 @@ SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa | |||
82 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 83 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
83 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 84 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
84 | SRC_URI[pbkdf2-0.12.2.sha256sum] = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" | 85 | SRC_URI[pbkdf2-0.12.2.sha256sum] = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" |
86 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | ||
85 | SRC_URI[proc-macro2-1.0.70.sha256sum] = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" | 87 | SRC_URI[proc-macro2-1.0.70.sha256sum] = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" |
86 | SRC_URI[pyo3-0.20.0.sha256sum] = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" | 88 | SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" |
87 | SRC_URI[pyo3-build-config-0.20.0.sha256sum] = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" | 89 | SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" |
88 | SRC_URI[pyo3-ffi-0.20.0.sha256sum] = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" | 90 | SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" |
89 | SRC_URI[pyo3-macros-0.20.0.sha256sum] = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" | 91 | SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" |
90 | SRC_URI[pyo3-macros-backend-0.20.0.sha256sum] = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" | 92 | SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" |
91 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" | 93 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" |
92 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 94 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" |
93 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 95 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
diff --git a/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch b/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch new file mode 100644 index 0000000000..3f671fcc98 --- /dev/null +++ b/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch | |||
@@ -0,0 +1,111 @@ | |||
1 | From cfdd98b3215cc12e66190a9c7f0a32c052e3c2e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 26 Feb 2024 18:26:30 -0800 | ||
4 | Subject: [PATCH] Bump pyo3 from 0.20.0 to 0.20.3 in /src/_bcrypt (#746) | ||
5 | |||
6 | It fixes build on hosts without 64bit atomics | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/pyca/bcrypt/commit/c2ef9350798ab59b18e8a0e04a01389858578fe0] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/_bcrypt/Cargo.lock | 22 ++++++++++++++-------- | ||
12 | src/_bcrypt/Cargo.toml | 2 +- | ||
13 | 2 files changed, 15 insertions(+), 9 deletions(-) | ||
14 | |||
15 | --- a/src/_bcrypt/Cargo.lock | ||
16 | +++ b/src/_bcrypt/Cargo.lock | ||
17 | @@ -233,6 +233,12 @@ dependencies = [ | ||
18 | ] | ||
19 | |||
20 | [[package]] | ||
21 | +name = "portable-atomic" | ||
22 | +version = "1.6.0" | ||
23 | +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
24 | +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | ||
25 | + | ||
26 | +[[package]] | ||
27 | name = "proc-macro2" | ||
28 | version = "1.0.70" | ||
29 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
30 | @@ -243,15 +249,16 @@ dependencies = [ | ||
31 | |||
32 | [[package]] | ||
33 | name = "pyo3" | ||
34 | -version = "0.20.0" | ||
35 | +version = "0.20.3" | ||
36 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
37 | -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" | ||
38 | +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" | ||
39 | dependencies = [ | ||
40 | "cfg-if", | ||
41 | "indoc", | ||
42 | "libc", | ||
43 | "memoffset", | ||
44 | "parking_lot", | ||
45 | + "portable-atomic", | ||
46 | "pyo3-build-config", | ||
47 | "pyo3-ffi", | ||
48 | "pyo3-macros", | ||
49 | @@ -260,9 +267,9 @@ dependencies = [ | ||
50 | |||
51 | [[package]] | ||
52 | name = "pyo3-build-config" | ||
53 | -version = "0.20.0" | ||
54 | +version = "0.20.3" | ||
55 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
56 | -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" | ||
57 | +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" | ||
58 | dependencies = [ | ||
59 | "once_cell", | ||
60 | "target-lexicon", | ||
61 | @@ -270,9 +277,9 @@ dependencies = [ | ||
62 | |||
63 | [[package]] | ||
64 | name = "pyo3-ffi" | ||
65 | -version = "0.20.0" | ||
66 | +version = "0.20.3" | ||
67 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
68 | -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" | ||
69 | +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" | ||
70 | dependencies = [ | ||
71 | "libc", | ||
72 | "pyo3-build-config", | ||
73 | @@ -280,9 +287,9 @@ dependencies = [ | ||
74 | |||
75 | [[package]] | ||
76 | name = "pyo3-macros" | ||
77 | -version = "0.20.0" | ||
78 | +version = "0.20.3" | ||
79 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
80 | -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" | ||
81 | +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" | ||
82 | dependencies = [ | ||
83 | "proc-macro2", | ||
84 | "pyo3-macros-backend", | ||
85 | @@ -292,12 +299,13 @@ dependencies = [ | ||
86 | |||
87 | [[package]] | ||
88 | name = "pyo3-macros-backend" | ||
89 | -version = "0.20.0" | ||
90 | +version = "0.20.3" | ||
91 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
92 | -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" | ||
93 | +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" | ||
94 | dependencies = [ | ||
95 | "heck", | ||
96 | "proc-macro2", | ||
97 | + "pyo3-build-config", | ||
98 | "quote", | ||
99 | "syn", | ||
100 | ] | ||
101 | --- a/src/_bcrypt/Cargo.toml | ||
102 | +++ b/src/_bcrypt/Cargo.toml | ||
103 | @@ -6,7 +6,7 @@ edition = "2018" | ||
104 | publish = false | ||
105 | |||
106 | [dependencies] | ||
107 | -pyo3 = { version = "0.20.0", features = ["abi3"] } | ||
108 | +pyo3 = { version = "0.20.3", features = ["abi3"] } | ||
109 | bcrypt = "0.15" | ||
110 | bcrypt-pbkdf = "0.10.0" | ||
111 | base64 = "0.21.5" | ||
diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb b/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb index 8328594bad..93fa645f33 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb | |||
@@ -11,6 +11,7 @@ SRC_URI[sha256sum] = "33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac | |||
11 | inherit pypi python_setuptools3_rust ptest-cargo cargo-update-recipe-crates | 11 | inherit pypi python_setuptools3_rust ptest-cargo cargo-update-recipe-crates |
12 | 12 | ||
13 | SRC_URI += " \ | 13 | SRC_URI += " \ |
14 | file://0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch \ | ||
14 | file://run-ptest \ | 15 | file://run-ptest \ |
15 | " | 16 | " |
16 | 17 | ||