diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-06-25 23:22:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-27 16:23:40 +0100 |
commit | cd0b19d626ed730b0c3b14e3cb492d63c31d8060 (patch) | |
tree | 715421e9f4d0475570710a478324501751314406 /meta/recipes-gnome/librsvg/librsvg | |
parent | 084ef1d41a4de6b2c569e63256ec07efd49036e8 (diff) | |
download | poky-cd0b19d626ed730b0c3b14e3cb492d63c31d8060.tar.gz |
librsvg: update 2.56.0 -> 2.56.1
Drop 0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch
as upstream fixed the issue.
(From OE-Core rev: f4d9dc2fb3ff0370917c37f61a46d47503d94420)
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/librsvg/librsvg')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch b/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch deleted file mode 100644 index 15d5abecc6..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg/0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From c0b0ef51b3c997a1c20ef9381ba2201ed477f609 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 21 Sep 2021 16:54:23 +0200 | ||
4 | Subject: [PATCH] system-deps/src/lib.rs: do not probe into harcoded list of | ||
5 | targets | ||
6 | |||
7 | Oe-core defines custom targets, and this probe fails. | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | --- | ||
13 | system-deps-6.0.3/src/lib.rs | 16 +--------------- | ||
14 | 2 files changed, 2 insertions(+), 16 deletions(-) | ||
15 | |||
16 | diff --git a/system-deps-6.0.3/src/lib.rs b/system-deps-6.0.3/src/lib.rs | ||
17 | index 45ab1ce..f87d1ec 100644 | ||
18 | --- a/system-deps-6.0.3/src/lib.rs | ||
19 | +++ b/system-deps-6.0.3/src/lib.rs | ||
20 | @@ -800,21 +800,7 @@ impl Config { | ||
21 | } | ||
22 | |||
23 | fn check_cfg(&self, cfg: &cfg_expr::Expression) -> Result<bool, Error> { | ||
24 | - use cfg_expr::{targets::get_builtin_target_by_triple, Predicate}; | ||
25 | - | ||
26 | - let target = self | ||
27 | - .env | ||
28 | - .get("TARGET") | ||
29 | - .expect("no TARGET env variable defined"); | ||
30 | - let target = get_builtin_target_by_triple(&target) | ||
31 | - .unwrap_or_else(|| panic!("Invalid TARGET: {}", target)); | ||
32 | - | ||
33 | - let res = cfg.eval(|pred| match pred { | ||
34 | - Predicate::Target(tp) => Some(tp.matches(target)), | ||
35 | - _ => None, | ||
36 | - }); | ||
37 | - | ||
38 | - res.ok_or_else(|| Error::UnsupportedCfg(cfg.original().to_string())) | ||
39 | + Ok(true) | ||
40 | } | ||
41 | } | ||
42 | |||