aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2022-01-05 19:04:58 +0000
committerPiotr Kubaj <pkubaj@FreeBSD.org>2022-01-05 19:04:58 +0000
commit51cc50759b234fe474a8c64ca96633a2b9128e03 (patch)
tree1ac9164f9a6cdfd5af21806d5d5253b2a3daa286
parentb8d60a503f2868e6730a1c85e7453743e9d6f32e (diff)
downloadports-51cc50759b234fe474a8c64ca96633a2b9128e03.tar.gz
ports-51cc50759b234fe474a8c64ca96633a2b9128e03.zip
graphics/librsvg2-rust: fix build on powerpc64le and powerpc
1. There are now two copies of cfg_expr used, both need to be patched. 2. For some reason, when powerpc64le block in cfg_expr 0.9 was lower than it is currently, the target failed to be identified as supported.
-rw-r--r--graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs38
-rw-r--r--graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs4
2 files changed, 40 insertions, 2 deletions
diff --git a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs
new file mode 100644
index 000000000000..69260e376741
--- /dev/null
+++ b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs
@@ -0,0 +1,38 @@
+https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0
+
+--- vendor/cfg-expr-0.8.1/src/targets/builtins.rs.orig 2021-09-16 01:15:26 UTC
++++ vendor/cfg-expr-0.8.1/src/targets/builtins.rs
+@@ -894,6 +894,16 @@ pub const ALL_BUILTINS: &[TargetInfo<'static>] = &[
+ endian: Endian::little,
+ },
+ TargetInfo {
++ triple: "powerpc-unknown-freebsd",
++ os: Some(Os::freebsd),
++ arch: Arch::powerpc,
++ env: None,
++ vendor: Some(Vendor::unknown),
++ family: Some(Family::unix),
++ pointer_width: 32,
++ endian: Endian::big,
++ },
++ TargetInfo {
+ triple: "powerpc-unknown-linux-gnu",
+ os: Some(Os::linux),
+ arch: Arch::powerpc,
+@@ -1002,6 +1012,16 @@ pub const ALL_BUILTINS: &[TargetInfo<'static>] = &[
+ family: Some(Family::unix),
+ pointer_width: 64,
+ endian: Endian::big,
++ },
++ TargetInfo {
++ triple: "powerpc64le-unknown-freebsd",
++ os: Some(Os::freebsd),
++ arch: Arch::powerpc64,
++ env: None,
++ vendor: Some(Vendor::unknown),
++ family: Some(Family::unix),
++ pointer_width: 64,
++ endian: Endian::little,
+ },
+ TargetInfo {
+ triple: "powerpc64le-unknown-linux-gnu",
diff --git a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs
index 2a7fbc137cf0..b0da8fced087 100644
--- a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs
+++ b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs
@@ -19,7 +19,7 @@ https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0
triple: Triple::new_const("powerpc-unknown-linux-gnu"),
os: Some(Os::linux),
arch: Arch::powerpc,
-@@ -1002,6 +1012,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
+@@ -992,6 +1002,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
family: Some(Family::unix),
pointer_width: 64,
endian: Endian::big,
@@ -35,4 +35,4 @@ https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0
+ endian: Endian::little,
},
TargetInfo {
- triple: Triple::new_const("powerpc64-unknown-linux-musl"),
+ triple: Triple::new_const("powerpc64-unknown-linux-gnu"),