<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e168e67ec12b5e52a101280df3b6b8aaca10292c">https://github.com/macports/macports-ports/commit/e168e67ec12b5e52a101280df3b6b8aaca10292c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e168e67 librsvg: don't apply cargo changes to pre-cargo build
</span>e168e67 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e168e67ec12b5e52a101280df3b6b8aaca10292c
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Apr 1 07:00:08 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> librsvg: don't apply cargo changes to pre-cargo build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56191
</span>---
graphics/librsvg/Portfile | 53 ++++++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 26 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 bd028b0..63cbb48 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,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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;'>@@ -55,43 +54,45 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> depends_build-delete \
port:cargo \
port:rust
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# when CARGO_BUILD_TARGET is set, directory structure changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-rust_target_subdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-vala=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-Bsymbolic
</span><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:#ffe0e0;'>-if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_name i686
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CARGO_BUILD_TARGET=${rust_platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} eq "i386"} {
</span><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> set arch_name i686
} else {
set arch_name ${build_arch}
}
set rust_platform ${arch_name}-apple-${os.platform}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span> CARGO_BUILD_TARGET=${rust_platform}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span> CARGO_BUILD_TARGET=${rust_platform}
<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;'>+gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-vala=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-Bsymbolic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set buildpath ${worksrcpath}/macports
post-build {
xinstall -d ${buildpath}
</pre><pre style='margin:0'>
</pre>