diff options
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch new file mode 100644 index 0000000000..c34a610522 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From d0f4f5b3ae900b9d092407e29b5372d93910c18c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 21 Sep 2021 16:27:14 +0200 | ||
4 | Subject: [PATCH] Makefile.am: pass rust target to cargo also when not cross | ||
5 | compiling | ||
6 | |||
7 | Otherwise oe-core's native build doesn't work either. | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | Makefile.am | 2 -- | ||
13 | configure.ac | 4 +--- | ||
14 | 2 files changed, 1 insertion(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index 2a89954..4e296d3 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -173,9 +173,7 @@ else | ||
21 | CARGO_RELEASE_ARGS=--release | ||
22 | endif | ||
23 | |||
24 | -if CROSS_COMPILING | ||
25 | CARGO_TARGET_ARGS=--target=$(RUST_TARGET) | ||
26 | -endif | ||
27 | |||
28 | CARGO_VERBOSE = $(cargo_verbose_$(V)) | ||
29 | cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY)) | ||
30 | diff --git a/configure.ac b/configure.ac | ||
31 | index 42215cf..2499c96 100644 | ||
32 | --- a/configure.ac | ||
33 | +++ b/configure.ac | ||
34 | @@ -292,9 +292,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)]) | ||
35 | : ${RUST_TARGET:=$host} | ||
36 | |||
37 | AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) | ||
38 | -AS_IF([test "x$cross_compiling" = "xyes"], [ | ||
39 | - RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" | ||
40 | -]) | ||
41 | +RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR" | ||
42 | AC_SUBST([RUST_TARGET_SUBDIR]) | ||
43 | |||
44 | dnl =========================================================================== | ||