<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1f460f769ac5bd887670ca7f3941ed589dd5cb8f">https://github.com/macports/macports-ports/commit/1f460f769ac5bd887670ca7f3941ed589dd5cb8f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1f460f769ac5bd887670ca7f3941ed589dd5cb8f
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Tue Mar 20 20:36:47 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> audacity: add missing stdlib flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56097
</span>---
audio/audacity/Portfile | 10 ++++++++++
audio/audacity/files/libvamp-Makefile-for-osx.diff | 6 ++++--
2 files changed, 14 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/Portfile b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2efd1db..88792d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +189,16 @@ configure.env-append \
</span> depends_lib-append \
port:portmidi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure the C++ stdlib argument is added to the LDFLAGS too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.cxx_stdlib} ne "" && [string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args-append V=1 VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# with everything defined/declared as intended we can now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# handle the post-patch step with its reinplace statements.
</span> post-patch {
set python_bin ${prefix}/bin/python2.7
reinplace -W ${worksrcpath} "s|@@PYTHON@@|${python_bin}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,6 +216,8 @@ post-patch {
</span> reinplace -W ${worksrcpath} "s| -Werror||g" \
lib-src/portaudio-v19/configure.in \
lib-src/portaudio-v19/configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@LDFLAGS@|${configure.ldflags}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib-src/libvamp/Makefile.in
</span> platform darwin {
# audacity 2.1.2 contains C++ files that include system SDK headers and ObjC code on OS X;
# they must thus be built as ObjC++
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/audacity/files/libvamp-Makefile-for-osx.diff b/audio/audacity/files/libvamp-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e0edb8..0fd060b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/audacity/files/libvamp-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/audacity/files/libvamp-Makefile-for-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/lib-src/libvamp/Makefile.in b/lib-src/libvamp/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4fc9378..5e6116d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4fc9378b57c70675c0f0243b2598342c4414ccf9..a56a05346e595d73d7189d4b7bcfe89e93bfb1bb 100644
</span> --- a/lib-src/libvamp/Makefile.in
+++ b/lib-src/libvamp/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,21 +100,21 @@ INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,22 +100,23 @@ INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig
</span>
# Flags required to tell the compiler to create a dynamically loadable object
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,5 +30,7 @@ index 4fc9378..5e6116d 100644
</span> +SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
+HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += @LDFLAGS@
</span>
### End of user-serviceable parts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>