<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40756d56d50ca9012535a9dda6a840b71468ba71">https://github.com/macports/macports-ports/commit/40756d56d50ca9012535a9dda6a840b71468ba71</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 40756d5 faust, faust-devel: Use the right C++ lib for the entire build
</span>40756d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40756d56d50ca9012535a9dda6a840b71468ba71
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 31 18:16:35 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> faust, faust-devel: Use the right C++ lib for the entire build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also reinplace quietly when affecting many files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also reinplace more accurately (escape literal period).
</span>---
audio/faust-devel/Portfile | 16 ++++++++--------
.../files/patch-compiler-Makefile.unix.diff | 11 ++++-------
audio/faust/Portfile | 18 +++++++++---------
audio/faust/files/patch-compiler-Makefile.unix.diff | 11 ++++-------
4 files changed, 25 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust-devel/Portfile b/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f182461..e5780bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,12 +49,6 @@ depends_lib port:clang-${llvm_version} \
</span> patchfiles patch-compiler-Makefile.unix.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdlib_flag -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdlib_flag {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@STDLIB_FLAG@|${stdlib_flag}|g" ${worksrcpath}/compiler/Makefile.unix
</span> reinplace "s|/usr/local/|/usr/./local/|g" \
${worksrcpath}/tools/faust2appls/faust2faustvst
reinplace "s|/usr/local|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +64,22 @@ post-patch {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/./local/|/usr/local/|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/\./local/|/usr/local/|g" \
</span> ${worksrcpath}/tools/faust2appls/faust2faustvst
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set stdlib_flag -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set stdlib_flag {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
variant universal {}
build.args-append ARCHFLAGS="[get_canonical_archflags cxx]" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} -std=gnu++11 [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} -std=gnu++11 ${stdlib_flag} [get_canonical_archflags cxx]"
</span> build.target world
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust-devel/files/patch-compiler-Makefile.unix.diff b/audio/faust-devel/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7cf073..a0d5549 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust-devel/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust-devel/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- compiler/Makefile.unix.orig 2018-01-30 04:50:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ compiler/Makefile.unix 2018-01-30 11:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,8 +166,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- compiler/Makefile.unix.orig 2018-01-31 17:36:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ compiler/Makefile.unix 2018-01-31 18:07:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,6 @@
</span>
ifeq ($(system), Darwin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS += -I /opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS += -I /opt/local/include
</span> - CXXFLAGS += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS += -I$(prefix)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS += @STDLIB_FLAG@
</span> else
ifneq ($(findstring MINGW32, $(system)),)
CXXFLAGS += -O1 -I/usr/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust/Portfile b/audio/faust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01e20ae..a61b04d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +44,9 @@ depends_lib port:clang-${llvm_version} \
</span> patchfiles patch-compiler-Makefile.unix.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdlib_flag -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set stdlib_flag {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@STDLIB_FLAG@|${stdlib_flag}|g" ${worksrcpath}/compiler/Makefile.unix
</span> reinplace "s|/usr/local/|/usr/./local/|g" \
${worksrcpath}/tools/faust2appls/faust2faustvst
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/local|${prefix}|g" \
</span> ${worksrcpath}/compiler/parser/enrobage.cpp \
${worksrcpath}/compiler/tlib/compatibility.cpp \
${worksrcpath}/tools/scbuilder/scbuilder \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,16 +59,22 @@ post-patch {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/./local/|/usr/local/|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/\./local/|/usr/local/|g" \
</span> ${worksrcpath}/tools/faust2appls/faust2faustvst
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set stdlib_flag -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set stdlib_flag {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
variant universal {}
build.args-append ARCHFLAGS="[get_canonical_archflags cxx]" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} -std=gnu++11 [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} -std=gnu++11 ${stdlib_flag} [get_canonical_archflags cxx]"
</span> build.target world
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust/files/patch-compiler-Makefile.unix.diff b/audio/faust/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7cf073..a0d5549 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust/files/patch-compiler-Makefile.unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- compiler/Makefile.unix.orig 2018-01-30 04:50:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ compiler/Makefile.unix 2018-01-30 11:13:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,8 +166,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- compiler/Makefile.unix.orig 2018-01-31 17:36:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ compiler/Makefile.unix 2018-01-31 18:07:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,6 @@
</span>
ifeq ($(system), Darwin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS += -I /opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS += -I /opt/local/include
</span> - CXXFLAGS += -stdlib=libc++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS += -I$(prefix)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS += @STDLIB_FLAG@
</span> else
ifneq ($(findstring MINGW32, $(system)),)
CXXFLAGS += -O1 -I/usr/include
</pre><pre style='margin:0'>
</pre>