diff options
Diffstat (limited to 'meta/recipes-gnome/librsvg')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.54.4.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb index f3bbeb74eb..82b1bf9bce 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb | |||
@@ -14,7 +14,7 @@ SECTION = "x11/utils" | |||
14 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libxml2 pango python3-docutils-native" | 14 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libxml2 pango python3-docutils-native" |
15 | BBCLASSEXTEND = "native nativesdk" | 15 | BBCLASSEXTEND = "native nativesdk" |
16 | 16 | ||
17 | inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen | 17 | inherit cargo_common gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen |
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 \ |
@@ -29,7 +29,6 @@ BASEDEPENDS:append = " cargo-native" | |||
29 | 29 | ||
30 | export RUST_BACKTRACE = "full" | 30 | export RUST_BACKTRACE = "full" |
31 | export RUSTFLAGS | 31 | export RUSTFLAGS |
32 | export RUST_TARGET_PATH | ||
33 | 32 | ||
34 | export RUST_TARGET = "${RUST_HOST_SYS}" | 33 | export RUST_TARGET = "${RUST_HOST_SYS}" |
35 | 34 | ||
@@ -38,16 +37,17 @@ RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" | |||
38 | RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" | 37 | RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" |
39 | RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" | 38 | RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" |
40 | 39 | ||
40 | CARGO_DISABLE_BITBAKE_VENDORING = "1" | ||
41 | do_configure[postfuncs] += "cargo_common_do_configure" | ||
42 | |||
43 | inherit rust-target-config | ||
44 | |||
41 | # rust-cross writes the target linker binary into target json definition without any flags. | 45 | # rust-cross writes the target linker binary into target json definition without any flags. |
42 | # This breaks here because the linker isn't going to work without at least knowing where | 46 | # This breaks here because the linker isn't going to work without at least knowing where |
43 | # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class | 47 | # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class |
44 | # which supplies the needed flags. | 48 | # which supplies the needed flags. |
45 | do_compile:prepend() { | 49 | do_compile:prepend() { |
46 | cp ${STAGING_LIBDIR_NATIVE}/rustlib/${HOST_SYS}.json ${WORKDIR} | 50 | sed -ie 's,"linker": ".*","linker": "${RUST_TARGET_CC}",g' ${RUST_TARGETS_DIR}/${RUST_HOST_SYS}.json |
47 | cp ${STAGING_LIBDIR_NATIVE}/rustlib/${BUILD_SYS}.json ${WORKDIR} | ||
48 | sed -ie 's,"linker": ".*","linker": "${RUST_TARGET_CC}",g' ${WORKDIR}/${RUST_HOST_SYS}.json | ||
49 | RUST_TARGET_PATH="${WORKDIR}" | ||
50 | export RUST_TARGET_PATH | ||
51 | } | 51 | } |
52 | 52 | ||
53 | # Issue only on windows | 53 | # Issue only on windows |