<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/ac15b77493fbe6788c50ffe05b70dd37c709d9dd">https://github.com/macports/macports-ports/commit/ac15b77493fbe6788c50ffe05b70dd37c709d9dd</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 ac15b77 samurai: new port
</span>ac15b77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ac15b77493fbe6788c50ffe05b70dd37c709d9dd
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Thu Dec 12 10:53:20 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> samurai: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Samurai is a lean-and-mean drop-in alternative for ninja. It reduces
</span><span style='display:block; white-space:pre;color:#404040;'> the resource overhead required for building large projects and allows
</span><span style='display:block; white-space:pre;color:#404040;'> certain options to be set via the SAMUFLAGS env. variable. This can
</span><span style='display:block; white-space:pre;color:#404040;'> have huge benefits for building a huge project like QtWebEngine which
</span><span style='display:block; white-space:pre;color:#404040;'> calls ninja somewhere deep in its build system bowels, with providing
</span><span style='display:block; white-space:pre;color:#404040;'> control over the options to pass to the command. Since multiple ninja
</span><span style='display:block; white-space:pre;color:#404040;'> commands can end up running concurrently which all launch as many compile
</span><span style='display:block; white-space:pre;color:#404040;'> jobs as they see fit, even powerful systems can be stressed to the max.
</span><span style='display:block; white-space:pre;color:#404040;'> This PR contains changes to port:qt5*-qtwebengine that force each samu
</span><span style='display:block; white-space:pre;color:#404040;'> job the launch at most $build.jobs jobs.
</span>---
aqua/qt5/Portfile | 3 ++-
aqua/qt511/Portfile | 3 ++-
aqua/qt59/Portfile | 3 ++-
devel/ninja/Portfile | 1 +
devel/samurai/Portfile | 42 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 49 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba4090f..cb3b037 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -585,7 +585,7 @@ array set modules {
</span> adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb
255593964
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27 port:py27-ply port:ninja port:gperf port:bison port:flex"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27 port:py27-ply path:bin/ninja:samurai port:gperf port:bison port:flex"
</span> "port:fontconfig port:dbus port:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 port:jsoncpp port:protobuf3-cpp port:poppler port:pulseaudio port:icu path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
"qtdeclarative qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools"
{"Qt WebEngine"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1473,6 +1473,7 @@ foreach {module module_info} [array get modules] {
</span> # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SAMUFLAGS=-j${build.jobs}
</span> configure.args-append QMAKE_LINK=${configure.cxx}
# avoid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77b9dd5..26e2416 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -593,7 +593,7 @@ array set modules {
</span> 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe
233678844
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27 port:py27-ply port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27 port:py27-ply path:bin/ninja:samurai"
</span> ""
"qtquickcontrols qtwebchannel qtlocation qttools"
{"Qt WebEngine"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1461,6 +1461,7 @@ foreach {module module_info} [array get modules] {
</span> # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SAMUFLAGS=-j${build.jobs}
</span> configure.args-append QMAKE_LINK=${configure.cxx}
# see https://chromium.googlesource.com/chromium/src/+/cd7154e0bb5f3ca9c72586da79f87d13afb5361a%5E%21/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd9b5cd..057c80d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -591,7 +591,7 @@ array set modules {
</span> 74d3c3430a294faac2c6048ac5224f82fe98247a86cac13b386aa5a1c22db27c
215346584
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:python27 port:py27-ply port:ninja"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:python27 port:py27-ply path:bin/ninja:samurai"
</span> ""
"qtquickcontrols qtwebchannel qtlocation qttools"
{"Qt WebEngine"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1442,6 +1442,7 @@ foreach {module module_info} [array get modules] {
</span> # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SAMUFLAGS=-j${build.jobs}
</span> configure.args-append QMAKE_LINK=${configure.cxx}
# see https://trac.macports.org/ticket/59294
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/Portfile b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 99ce159..a41a367 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +12,7 @@ platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license Apache-2
installs_libs no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts samurai
</span>
description Small build system with a focus on speed.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/samurai/Portfile b/devel/samurai/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c8c9595
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/samurai/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup michaelforney samurai 0.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description ninja-compatible build tool written in C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description samurai (samu) is a compatible replacement ninja build tool written in C99 with \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a focus on simplicity, speed, and portability. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ samurai implements the ninja build language through version 1.9.0 except \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for MSVC dependency handling (deps = msvc). It uses the same format for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .ninja_log and .ninja_deps as ninja, currently version 5 and 4 respectively. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It is feature-complete and supports most of the same options as ninja. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The port provides the native `samu` command and a symlink so it can be called \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as `ninja` by standard build systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dd72603a03490a50f378ef228d1d86f3238ca0b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 41ca07134e0ee1dc5f0f8f83a432f8c285cb1615508cb9dc2b47290c6e0c3943 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28217
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args-delete all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s samu ${destroot}${prefix}/bin/ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s samu.1.gz ${destroot}${prefix}/share/man/man1/ninja.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>