<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/58c748e62680013d146097d30c3450a827c2d716">https://github.com/macports/macports-ports/commit/58c748e62680013d146097d30c3450a827c2d716</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 58c748e libxml2-bootstrap: just use icu58 on 10.7+
</span>58c748e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58c748e62680013d146097d30c3450a827c2d716
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 27 14:22:06 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> libxml2-bootstrap: just use icu58 on 10.7+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> We don't need to bootstrap libcxx on 10.7 and 10.8, but we do need to
</span><span style='display:block; white-space:pre;color:#404040;'> bootstrap a C++11 compiler to be able to build the current version of
</span><span style='display:block; white-space:pre;color:#404040;'> icu. So let's make libxml2-bootstrap useful on those platforms for the
</span><span style='display:block; white-space:pre;color:#404040;'> benefit of clang-3.4, by depending on the last pre-C++11 version of
</span><span style='display:block; white-space:pre;color:#404040;'> icu, but not the other (libstdc++-based) bootstrap ports.
</span>---
textproc/libxml2/Portfile | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/Portfile b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f60887..4ed3f0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,24 +38,35 @@ set my_prefix ${prefix}
</span>
# This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib
</span> set my_prefix ${prefix}/libexec/libcxx-bootstrap
configure.pre_args --prefix=${my_prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:libiconv port:libiconv-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu port:icu-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz port:xz-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:libiconv port:libiconv-bootstrap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu port:icu-bootstrap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz port:xz-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 10.7 has libc++ but still needs a C++11 compiler for icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:icu port:icu58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${prefix}/libexec/icu58/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${prefix}/libexec/icu58/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${prefix}/libexec/icu58/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append include.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport ne "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append include.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-patch {
reinplace "s|@PREFIX@|${my_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</pre><pre style='margin:0'>
</pre>