summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-10 21:10:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-14 11:48:45 +0100
commitb88709a5b9d46fb02543f8ea825a5c73f46ace6e (patch)
tree0a4a273b74454ccac4318b5f2bbe750a5e89fbd0 /meta/recipes-gnome
parentc7af21fd8b490a0099ce530188ac99b23612a7c5 (diff)
downloadpoky-b88709a5b9d46fb02543f8ea825a5c73f46ace6e.tar.gz
librsvg: use only the target architecture to determine availability of atomic primitives
This eliminates the hardcoded list of rust targets which can't possibly include everything from OE universe. (From OE-Core rev: d59f69b136dceb490dbb1ca3c2f20e7ff3e28ad6) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch148
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.52.0.bb1
2 files changed, 149 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
new file mode 100644
index 0000000000..488c607480
--- /dev/null
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
@@ -0,0 +1,148 @@
1From 70557b217644901daaf9d8ef793f5e84c937762e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 5 Oct 2021 23:41:59 +0200
4Subject: [PATCH] crossbeam-utils: check only the architecture, not the whole
5 target string
6
7There can be custom targets in use, and it's not possible to make a list
8of them; for the check only the first item in the target string is actually
9relevant (the architecture of the target).
10
11Upstream-Status: Pending [needs an upstream ticket and possibly a rework of list generator script]
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14 vendor/crossbeam-utils/.cargo-checksum.json | 4 +-
15 vendor/crossbeam-utils/build.rs | 8 ++-
16 vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++-------------
17 3 files changed, 38 insertions(+), 52 deletions(-)
18
19diff --git a/vendor/crossbeam-utils/.cargo-checksum.json b/vendor/crossbeam-utils/.cargo-checksum.json
20index 4ffc417..2d476df 100644
21--- a/vendor/crossbeam-utils/.cargo-checksum.json
22+++ b/vendor/crossbeam-utils/.cargo-checksum.json
23@@ -1 +1,3 @@
24-{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"68cfc4be02429834a19411fba29cb1cb52c841f03ac8104d1bae59a8b2184f9c","no_atomic.rs":"a2621c1b029c614fb0ab8e3f5cda2e839df88d90d26133181c1b901965f7eec4","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
25\ No newline at end of file
26+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d",
27+"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354",
28+"no_atomic.rs":"fda07862ab8c3ac999b58b494fa963e4024a0979037f4c37cf2069d78ab6e5ba","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
29diff --git a/vendor/crossbeam-utils/build.rs b/vendor/crossbeam-utils/build.rs
30index 9c924ad..e97953c 100644
31--- a/vendor/crossbeam-utils/build.rs
32+++ b/vendor/crossbeam-utils/build.rs
33@@ -20,17 +20,19 @@ fn main() {
34 }
35 };
36
37+ let target_arch = target.split('-').next().unwrap_or_default();
38+
39 // Note that this is `no_*`, not `has_*`. This allows treating
40 // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't
41 // run. This is needed for compatibility with non-cargo build systems that
42 // don't run the build script.
43- if NO_ATOMIC_CAS.contains(&&*target) {
44+ if NO_ATOMIC_CAS.contains(&&*target_arch) {
45 println!("cargo:rustc-cfg=crossbeam_no_atomic_cas");
46 }
47- if NO_ATOMIC.contains(&&*target) {
48+ if NO_ATOMIC.contains(&&*target_arch) {
49 println!("cargo:rustc-cfg=crossbeam_no_atomic");
50 println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
51- } else if NO_ATOMIC_64.contains(&&*target) {
52+ } else if NO_ATOMIC_64.contains(&&*target_arch) {
53 println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
54 } else {
55 // Otherwise, assuming `"max-atomic-width" == 64`.
56diff --git a/vendor/crossbeam-utils/no_atomic.rs b/vendor/crossbeam-utils/no_atomic.rs
57index 522b3b8..8096630 100644
58--- a/vendor/crossbeam-utils/no_atomic.rs
59+++ b/vendor/crossbeam-utils/no_atomic.rs
60@@ -2,58 +2,40 @@
61 // It is not intended for manual editing.
62
63 const NO_ATOMIC_CAS: &[&str] = &[
64- "avr-unknown-gnu-atmega328",
65- "msp430-none-elf",
66- "riscv32i-unknown-none-elf",
67- "riscv32imc-unknown-none-elf",
68- "thumbv4t-none-eabi",
69- "thumbv6m-none-eabi",
70+ "avr",
71+ "msp430",
72+ "riscv32i",
73+ "riscv32imc",
74+ "thumbv4t",
75+ "thumbv6m",
76 ];
77 #[allow(dead_code)]
78 const NO_ATOMIC_64: &[&str] = &[
79- "arm-linux-androideabi",
80- "armebv7r-none-eabi",
81- "armebv7r-none-eabihf",
82- "armv4t-unknown-linux-gnueabi",
83- "armv5te-unknown-linux-gnueabi",
84- "armv5te-unknown-linux-musleabi",
85- "armv5te-unknown-linux-uclibceabi",
86- "armv7r-none-eabi",
87- "armv7r-none-eabihf",
88- "hexagon-unknown-linux-musl",
89- "mips-unknown-linux-gnu",
90- "mips-unknown-linux-musl",
91- "mips-unknown-linux-uclibc",
92- "mipsel-unknown-linux-gnu",
93- "mipsel-unknown-linux-musl",
94- "mipsel-unknown-linux-uclibc",
95- "mipsel-unknown-none",
96- "mipsisa32r6-unknown-linux-gnu",
97- "mipsisa32r6el-unknown-linux-gnu",
98- "powerpc-unknown-linux-gnu",
99- "powerpc-unknown-linux-gnuspe",
100- "powerpc-unknown-linux-musl",
101- "powerpc-unknown-netbsd",
102- "powerpc-unknown-openbsd",
103- "powerpc-wrs-vxworks",
104- "powerpc-wrs-vxworks-spe",
105- "riscv32gc-unknown-linux-gnu",
106- "riscv32gc-unknown-linux-musl",
107- "riscv32imac-unknown-none-elf",
108- "thumbv7em-none-eabi",
109- "thumbv7em-none-eabihf",
110- "thumbv7m-none-eabi",
111- "thumbv8m.base-none-eabi",
112- "thumbv8m.main-none-eabi",
113- "thumbv8m.main-none-eabihf",
114- "mipsel-sony-psp",
115- "thumbv4t-none-eabi",
116- "thumbv6m-none-eabi",
117+ "arm",
118+ "armebv7r",
119+ "armv4t",
120+ "armv5te",
121+ "armv7r",
122+ "hexagon",
123+ "mips",
124+ "mipsel",
125+ "mipsisa32r6",
126+ "mipsisa32r6el",
127+ "powerpc",
128+ "riscv32gc",
129+ "riscv32imac",
130+ "thumbv7em",
131+ "thumbv7m",
132+ "thumbv8m.base",
133+ "thumbv8m.main",
134+ "mipsel",
135+ "thumbv4t",
136+ "thumbv6m",
137 ];
138 #[allow(dead_code)]
139 const NO_ATOMIC: &[&str] = &[
140- "avr-unknown-gnu-atmega328",
141- "msp430-none-elf",
142- "riscv32i-unknown-none-elf",
143- "riscv32imc-unknown-none-elf",
144+ "avr",
145+ "msp430",
146+ "riscv32i",
147+ "riscv32imc",
148 ];
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb
index 28b8bf2dcf..50489453df 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb
@@ -22,6 +22,7 @@ SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.pat
22 file://0002-New-ToPixel-trait.patch \ 22 file://0002-New-ToPixel-trait.patch \
23 file://0003-New-ToCairoARGB-trait.patch \ 23 file://0003-New-ToCairoARGB-trait.patch \
24 file://0004-impl-ToPixel-for-CairoARGB.patch \ 24 file://0004-impl-ToPixel-for-CairoARGB.patch \
25 file://0001-crossbeam-utils-check-only-the-architecture-not-the-.patch \
25 " 26 "
26 27
27SRC_URI[archive.sha256sum] = "bd821fb3e16494b61f5185addd23b726b064f203122b3ab4b3d5d7a44e6bf393" 28SRC_URI[archive.sha256sum] = "bd821fb3e16494b61f5185addd23b726b064f203122b3ab4b3d5d7a44e6bf393"