diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-05 09:48:10 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-07 08:45:10 +0000 |
commit | ead2f6ced95d0df67080014700446db1fa254835 (patch) | |
tree | d91727dfae1f61bcfe3385a15feab40c1d257355 /meta/recipes-gnome/librsvg | |
parent | d5f7ee0e3029a90396df4e5db9159abe71612beb (diff) | |
download | poky-ead2f6ced95d0df67080014700446db1fa254835.tar.gz |
librsvg: set the needed atomic configuration flags directly per-target
Do not try to mangle the upstream list of targets;
after discussion with upstream it turns out it's neither
necessary nor upstreamable:
https://github.com/crossbeam-rs/crossbeam/pull/751
(From OE-Core rev: 97562668e1a76710acd2be7c8cdbcc1deb80bd9f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/librsvg')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch | 143 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.52.3.bb | 4 |
2 files changed, 3 insertions, 144 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 deleted file mode 100644 index 0c1cf59eff..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
1 | From 70557b217644901daaf9d8ef793f5e84c937762e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 5 Oct 2021 23:41:59 +0200 | ||
4 | Subject: [PATCH] crossbeam-utils: check only the architecture, not the whole | ||
5 | target string | ||
6 | |||
7 | There can be custom targets in use, and it's not possible to make a list | ||
8 | of them; for the check only the first item in the target string is actually | ||
9 | relevant (the architecture of the target). | ||
10 | |||
11 | Upstream-Status: Pending [needs an upstream ticket and possibly a rework of list generator script] | ||
12 | Signed-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 | |||
19 | --- a/vendor/crossbeam-utils/.cargo-checksum.json | ||
20 | +++ b/vendor/crossbeam-utils/.cargo-checksum.json | ||
21 | @@ -1 +1,3 @@ | ||
22 | -{"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"} | ||
23 | \ No newline at end of file | ||
24 | +{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d", | ||
25 | +"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354", | ||
26 | +"no_atomic.rs":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","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"} | ||
27 | --- a/vendor/crossbeam-utils/build.rs | ||
28 | +++ b/vendor/crossbeam-utils/build.rs | ||
29 | @@ -20,17 +20,19 @@ fn main() { | ||
30 | } | ||
31 | }; | ||
32 | |||
33 | + let target_arch = target.split('-').next().unwrap_or_default(); | ||
34 | + | ||
35 | // Note that this is `no_*`, not `has_*`. This allows treating | ||
36 | // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't | ||
37 | // run. This is needed for compatibility with non-cargo build systems that | ||
38 | // don't run the build script. | ||
39 | - if NO_ATOMIC_CAS.contains(&&*target) { | ||
40 | + if NO_ATOMIC_CAS.contains(&&*target_arch) { | ||
41 | println!("cargo:rustc-cfg=crossbeam_no_atomic_cas"); | ||
42 | } | ||
43 | - if NO_ATOMIC.contains(&&*target) { | ||
44 | + if NO_ATOMIC.contains(&&*target_arch) { | ||
45 | println!("cargo:rustc-cfg=crossbeam_no_atomic"); | ||
46 | println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); | ||
47 | - } else if NO_ATOMIC_64.contains(&&*target) { | ||
48 | + } else if NO_ATOMIC_64.contains(&&*target_arch) { | ||
49 | println!("cargo:rustc-cfg=crossbeam_no_atomic_64"); | ||
50 | } else { | ||
51 | // Otherwise, assuming `"max-atomic-width" == 64`. | ||
52 | --- a/vendor/crossbeam-utils/no_atomic.rs | ||
53 | +++ b/vendor/crossbeam-utils/no_atomic.rs | ||
54 | @@ -2,58 +2,41 @@ | ||
55 | // It is not intended for manual editing. | ||
56 | |||
57 | const NO_ATOMIC_CAS: &[&str] = &[ | ||
58 | - "avr-unknown-gnu-atmega328", | ||
59 | - "msp430-none-elf", | ||
60 | - "riscv32i-unknown-none-elf", | ||
61 | - "riscv32imc-unknown-none-elf", | ||
62 | - "thumbv4t-none-eabi", | ||
63 | - "thumbv6m-none-eabi", | ||
64 | + "avr", | ||
65 | + "msp430", | ||
66 | + "riscv32i", | ||
67 | + "riscv32imc", | ||
68 | + "thumbv4t", | ||
69 | + "thumbv6m", | ||
70 | ]; | ||
71 | #[allow(dead_code)] | ||
72 | const NO_ATOMIC_64: &[&str] = &[ | ||
73 | - "arm-linux-androideabi", | ||
74 | - "armebv7r-none-eabi", | ||
75 | - "armebv7r-none-eabihf", | ||
76 | - "armv4t-unknown-linux-gnueabi", | ||
77 | - "armv5te-unknown-linux-gnueabi", | ||
78 | - "armv5te-unknown-linux-musleabi", | ||
79 | - "armv5te-unknown-linux-uclibceabi", | ||
80 | - "armv7r-none-eabi", | ||
81 | - "armv7r-none-eabihf", | ||
82 | - "hexagon-unknown-linux-musl", | ||
83 | - "mips-unknown-linux-gnu", | ||
84 | - "mips-unknown-linux-musl", | ||
85 | - "mips-unknown-linux-uclibc", | ||
86 | - "mipsel-unknown-linux-gnu", | ||
87 | - "mipsel-unknown-linux-musl", | ||
88 | - "mipsel-unknown-linux-uclibc", | ||
89 | - "mipsel-unknown-none", | ||
90 | - "mipsisa32r6-unknown-linux-gnu", | ||
91 | - "mipsisa32r6el-unknown-linux-gnu", | ||
92 | - "powerpc-unknown-linux-gnu", | ||
93 | - "powerpc-unknown-linux-gnuspe", | ||
94 | - "powerpc-unknown-linux-musl", | ||
95 | - "powerpc-unknown-netbsd", | ||
96 | - "powerpc-unknown-openbsd", | ||
97 | - "powerpc-wrs-vxworks", | ||
98 | - "powerpc-wrs-vxworks-spe", | ||
99 | - "riscv32gc-unknown-linux-gnu", | ||
100 | - "riscv32gc-unknown-linux-musl", | ||
101 | - "riscv32imac-unknown-none-elf", | ||
102 | - "thumbv7em-none-eabi", | ||
103 | - "thumbv7em-none-eabihf", | ||
104 | - "thumbv7m-none-eabi", | ||
105 | - "thumbv8m.base-none-eabi", | ||
106 | - "thumbv8m.main-none-eabi", | ||
107 | - "thumbv8m.main-none-eabihf", | ||
108 | - "mipsel-sony-psp", | ||
109 | - "thumbv4t-none-eabi", | ||
110 | - "thumbv6m-none-eabi", | ||
111 | + "arm", | ||
112 | + "armebv7r", | ||
113 | + "armv4t", | ||
114 | + "armv5te", | ||
115 | + "armv7r", | ||
116 | + "hexagon", | ||
117 | + "mips", | ||
118 | + "mipsel", | ||
119 | + "mipsisa32r6", | ||
120 | + "mipsisa32r6el", | ||
121 | + "powerpc", | ||
122 | + "riscv32", | ||
123 | + "riscv32gc", | ||
124 | + "riscv32imac", | ||
125 | + "thumbv7em", | ||
126 | + "thumbv7m", | ||
127 | + "thumbv8m.base", | ||
128 | + "thumbv8m.main", | ||
129 | + "mipsel", | ||
130 | + "thumbv4t", | ||
131 | + "thumbv6m", | ||
132 | ]; | ||
133 | #[allow(dead_code)] | ||
134 | const NO_ATOMIC: &[&str] = &[ | ||
135 | - "avr-unknown-gnu-atmega328", | ||
136 | - "msp430-none-elf", | ||
137 | - "riscv32i-unknown-none-elf", | ||
138 | - "riscv32imc-unknown-none-elf", | ||
139 | + "avr", | ||
140 | + "msp430", | ||
141 | + "riscv32i", | ||
142 | + "riscv32imc", | ||
143 | ]; | ||
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb index 335d891f05..6c4850271d 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb | |||
@@ -18,7 +18,6 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec | |||
18 | 18 | ||
19 | SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ | 19 | SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ |
20 | file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ | 20 | file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ |
21 | file://0001-crossbeam-utils-check-only-the-architecture-not-the-.patch \ | ||
22 | file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ | 21 | file://0001-vendor-system-deps-sort-dependencies-before-using-th.patch \ |
23 | file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ | 22 | file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch \ |
24 | file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ | 23 | file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch \ |
@@ -39,6 +38,9 @@ export RUST_TARGET_PATH | |||
39 | 38 | ||
40 | export RUST_TARGET = "${HOST_SYS}" | 39 | export RUST_TARGET = "${HOST_SYS}" |
41 | 40 | ||
41 | RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" | ||
42 | RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" | ||
43 | |||
42 | # rust-cross writes the target linker binary into target json definition without any flags. | 44 | # rust-cross writes the target linker binary into target json definition without any flags. |
43 | # This breaks here because the linker isn't going to work without at least knowing where | 45 | # This breaks here because the linker isn't going to work without at least knowing where |
44 | # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class | 46 | # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class |