<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bcd0bba54c18b9c504e185d9f3e168b1bb54e5b7">https://github.com/macports/macports-ports/commit/bcd0bba54c18b9c504e185d9f3e168b1bb54e5b7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bcd0bba54c18b9c504e185d9f3e168b1bb54e5b7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Mar 30 05:58:38 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> librsvg: allow universal build
</span>---
graphics/librsvg/Portfile | 34 ++++++++++++++++++++--
.../librsvg/files/patch-rust_target_subdir.diff | 15 ++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 945b2c4..60f7960 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name librsvg
# version 2.42.3 requires unstable cairo >= 1.15.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +42,9 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> set pyversion 2.7
depends_run port:python[join [split ${pyversion} "."] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# cargo does not build universal or on 10.7 or earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cargo does not build on 10.7 or earlier
</span> # https://trac.macports.org/ticket/55783
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset universal] || ${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 12} {
</span> # revert to latest pre-cargo version
version 2.40.20
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +59,39 @@ if {[variant_isset universal] || ${os.major} < 12} {
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# when CARGO_BUILD_TARGET is set, directory structure changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-vala=yes \
--disable-silent-rules \
--disable-Bsymbolic
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set buildpath ${worksrcpath}/macports
post-build {
xinstall -d ${buildpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/files/patch-rust_target_subdir.diff b/graphics/librsvg/files/patch-rust_target_subdir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d0fa107
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/files/patch-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-01-24 09:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-03-21 09:01:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15371,9 +15371,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CROSS_COMPILING_FALSE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$cross_compiling" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if test "x$cross_compiling" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RUST_TARGET_SUBDIR="$CARGO_BUILD_TARGET/$RUST_TARGET_SUBDIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>