<pre style='margin:0'>
rainbow (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e8af0192eed243e8d0f8909fd06cd276092b0139">https://github.com/macports/macports-ports/commit/e8af0192eed243e8d0f8909fd06cd276092b0139</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 e8af019 fldigi: fix build removing -no-stack-check compiler flag on macOS < 10.10
</span>e8af019 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e8af0192eed243e8d0f8909fd06cd276092b0139
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Apr 6 15:36:11 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> fldigi: fix build removing -no-stack-check compiler flag on macOS < 10.10
</span>---
science/fldigi/Portfile | 17 ++++---
science/fldigi/files/remove_no-stack-check.patch | 56 ++++++++++++++++++++++++
2 files changed, 68 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/fldigi/Portfile b/science/fldigi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd8d822..c07448a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/fldigi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/fldigi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,11 @@ depends_lib-append \
</span> configure.args-append \
--without-pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pulseaudio description {Build fldigi with pulseaudio support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-pulseaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pulseaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build fix: remove -no-stack-check on macOS < 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove_no-stack-check.patch
</span> }
# We put this into a pre-configure block so it can be evaluated _after_ platform selection.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +72,13 @@ variant bundle description {Enable the optional macOS bundle of fldigi/flarq} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pulseaudio description {Build fldigi with pulseaudio support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pulseaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default_variants-append +bundle
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/fldigi/files/remove_no-stack-check.patch b/science/fldigi/files/remove_no-stack-check.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7248088
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/fldigi/files/remove_no-stack-check.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3a81383..f7c0e36 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13047,11 +13047,6 @@ $INTL_CFLAGS $PTW32_CFLAGS $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_CXXFLAGS="$FLDIGI_BUILD_CXXFLAGS -I\$(srcdir)/xmlrpcpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$target_darwin" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLDIGI_BUILD_CXXFLAGS="$FLDIGI_BUILD_CXXFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLDIGI_BUILD_CPPFLAGS="$FLDIGI_BUILD_CPPFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_LDFLAGS="$MAC_UNIVERSAL_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$target_mingw32" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13092,11 +13087,6 @@ $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBUG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD $LIBMBEDTLS_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$target_darwin" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLARQ_BUILD_CXXFLAGS="$FLARQ_BUILD_CXXFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLARQ_BUILD_CPPFLAGS="$FLARQ_BUILD_CPPFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLARQ_BUILD_LDFLAGS="$MAC_UNIVERSAL_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$target_mingw32" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/m4/build.m4 b/m4/build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bcdf290..8bae530 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/m4/build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/m4/build.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,11 +38,6 @@ $INTL_CFLAGS $PTW32_CFLAGS $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_CXXFLAGS="$FLDIGI_BUILD_CXXFLAGS -I\$(srcdir)/xmlrpcpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$target_darwin" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLDIGI_BUILD_CXXFLAGS="$FLDIGI_BUILD_CXXFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLDIGI_BUILD_CPPFLAGS="$FLDIGI_BUILD_CPPFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_LDFLAGS="$MAC_UNIVERSAL_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$target_mingw32" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,11 +78,6 @@ $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBUG_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD $LIBMBEDTLS_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$target_darwin" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLARQ_BUILD_CXXFLAGS="$FLARQ_BUILD_CXXFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FLARQ_BUILD_CPPFLAGS="$FLARQ_BUILD_CPPFLAGS -fno-stack-check -mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLARQ_BUILD_LDFLAGS="$MAC_UNIVERSAL_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$target_mingw32" = "xyes"; then
</span></pre><pre style='margin:0'>
</pre>