Update Earthfile to hopefully get cross-compilation for rust to work

This commit is contained in:
Patrick Pacher
2024-03-26 15:38:47 +01:00
parent d524bce166
commit 458336006f
7 changed files with 152 additions and 242 deletions

View File

@@ -0,0 +1,7 @@
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
rustflags = ["-C", "link-args=-L/usr/lib/aarch64-linux-gnu/"]
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"
rustflags = ["-C", "link-args=-L/usr/lib/arm-linux-gnueabihf/"]

View File

@@ -0,0 +1,7 @@
[target.aarch64-unknown-linux-gnu]
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main"
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH libjavascriptcoregtk-4.0-dev:$CROSS_DEB_ARCH librsvg2-dev libayatana-appindicator3-dev libwebkit2gtk-4.0-dev libsoup2.4-dev libgtk-3-dev"
]

View File

@@ -404,7 +404,7 @@ fn get_icon_as_png_dataurl(name: &str, size: i8) -> Result<(String, String)> {
let icon_info = gtk_icon_theme_lookup_icon(
GTK_DEFAULT_THEME.unwrap(),
c_str.as_ptr() as *const i8,
c_str.as_ptr() as *const u8,
size as c_int,
0,
);

View File

@@ -47,8 +47,8 @@
"depends": []
},
"externalBin": [
"binaries/portmaster-start",
"binaries/portmaster-core"
"../binaries/portmaster-start",
"../binaries/portmaster-core"
],
"icon": [
"../assets/icons/pm_dark_512.png",