librsvg: update to 2.44.7. (and rust fixes for armv7)

[Cogitri]

also cross builds now that rust cross build is a thingx

[Gottox]

There are a few errors during cross build:

• https://travis-ci.org/void-linux/void-packages/jobs/438870917#L1067
• https://travis-ci.org/void-linux/void-packages/jobs/438870919#L883
• https://travis-ci.org/void-linux/void-packages/jobs/438870920#L875

Looks like missing RUSTFLAGS. I'd like to set them globally like we set our CFLAGS as I expect that rust will sneak into many projects without being a cargo build-style.

[Cogitri]

I'd like to set them globally like we set our CFLAGS as I expect that rust will sneak into many projects without being a cargo build-style.

Sounds good, yes.

Looks like missing RUSTFLAGS.

No, that's actually due to rust using not suffixing armv7l with a l. I guess we will have to patch this into rust...

[Cogitri]

Currently testing this. librsvg already cross builds for everything but armv7l though.

[Cogitri]

Ack, had a power outage, currently rebuilding rust for x86_64 - armv7l already built. Will test librsvg afterwards.

[Cogitri]

Creating librsvg-2.44.6_1.armv7l.xbps for repository /host/binpkgs/rust-cross ...

cross compiling librsvg on armv7l works now.

[Gottox]

We still need to fix rust on arm*-musl.

[Cogitri]

Alright, I'll leave that to you :)

[Cogitri]

So, what is left to do here?

[Cogitri]

Maybe you could compile this on arm*musleabihf @jnbr, you already have the rust binpkgs :)

[jnbr]

Do we really need the armv7l targets?

[Cogitri]

Alright, I've reworked it, please take a 2nd look.

[Cogitri]

Alright, this works on aarch64 now - but librsvg fails to link on some other platforms. Will look into this tomorrow

[Gottox]

Can you post logs?

[Cogitri]

They all fail with something along the lines of https://gist.github.com/e63b8db8c3d9c51366fb2aa1224dc469

aarch64 works for some reason though

[Gottox]

$ ar x /builddir/librsvg-2.44.7/target/aarch64-unknown-linux-musl/release/librsvg_internals.a
$ file sysconf.lo                                                                            
sysconf.lo: ELF 64-bit LSB relocatable, x86-64, version 1 (SYSV), not stripped

It uses host libraries.

[Cogitri]

Here's a verbose log: https://paste.pound-python.org/show/qu2G4p9e72x2f5zI20Vb/

[Cogitri]

Alright, all arches other than aarch64-musl work from x86_64, but not from x86_64-musl, opened an issue about it upstream: https://gitlab.gnome.org/GNOME/librsvg/issues/360

[jnbr]

Seems to be just another case of rust treating musl as something special.
Re-applying this patch to rustc makes it work on armv7l-musl (others currently building).

--- rustc-1.28.0-src/src/liblibc/src/unix/mod.rs.orig   2018-10-14 16:54:15.555482375 +0200
+++ rustc-1.28.0-src/src/liblibc/src/unix/mod.rs        2018-10-14 16:54:47.153240177 +0200
@@ -276,13 +276,6 @@
     } else if #[cfg(feature = "use_std")] {
         // cargo build, don't pull in anything extra as the libstd dep
         // already pulls in all libs.
-    } else if #[cfg(target_env = "musl")] {
-        #[cfg_attr(feature = "stdbuild",
-                   link(name = "c", kind = "static",
-                        cfg(target_feature = "crt-static")))]
-        #[cfg_attr(feature = "stdbuild",
-                   link(name = "c", cfg(not(target_feature = "crt-static"))))]
-        extern {}
     } else if #[cfg(target_os = "emscripten")] {
         #[link(name = "c")]
         extern {}

[jnbr]

I opened #3778 which fixes this. Tested on x86_64-musl and armv7[-musl].

[Gottox]

#3778 is merged

[Cogitri]

Alright, does this need further testing or are you doing that already @Gottox?

[Gottox]

lgtm 👍

[Gottox]

gnome-shell on x86_64 is broken in a different way than before this update. 😄

[Cogitri]

Eh? On x86_64?

[Gottox]

Yep, but already got a fix :)

[Gottox]

fixed by f532213

[Gottox]

x86_64-musl, sry

[Cogitri]

Ah, that's why I was so confused :)