summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/librsvg/librsvg_2.52.3.bb
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-05 09:48:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-07 08:45:10 +0000
commitead2f6ced95d0df67080014700446db1fa254835 (patch)
treed91727dfae1f61bcfe3385a15feab40c1d257355 /meta/recipes-gnome/librsvg/librsvg_2.52.3.bb
parentd5f7ee0e3029a90396df4e5db9159abe71612beb (diff)
downloadpoky-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/librsvg_2.52.3.bb')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.52.3.bb4
1 files changed, 3 insertions, 1 deletions
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
19SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ 19SRC_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
40export RUST_TARGET = "${HOST_SYS}" 39export RUST_TARGET = "${HOST_SYS}"
41 40
41RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64"
42RUSTFLAGS: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