<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/c133a6e9b4d006d6576aa5853f05fd5cdc828af7">https://github.com/macports/macports-ports/commit/c133a6e9b4d006d6576aa5853f05fd5cdc828af7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c133a6e9b4d006d6576aa5853f05fd5cdc828af7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 12 18:59:33 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> dbtool: Force use of C++98
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build fails when using newer compilers that default to C++11.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a patch to fix the build system so it doesn't overwrite CXXFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'> with CFLAGS.
</span>---
databases/dbtool/Portfile | 7 +++++++
databases/dbtool/files/CXXFLAGS.patch | 12 ++++++++++++
2 files changed, 19 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/dbtool/Portfile b/databases/dbtool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95eff17e671..d777114b4e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/dbtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/dbtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,3 +29,10 @@ depends_build port:pkgconfig
</span> depends_lib port:gdbm \
port:pcre
depends_run bin:bash:bash
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Not compatible with C++11:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# engine.cc:327:43: error: non-constant-expression cannot be narrowed from type 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::size_type' (aka 'unsigned long') to 'int' in initializer list [-Wc++11-narrowing]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++98
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/dbtool/files/CXXFLAGS.patch b/databases/dbtool/files/CXXFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..706fcb36611
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/dbtool/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not overwrite CXXFLAGS with CFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-05-16 02:58:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-12 18:54:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11549,7 +11549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$enable_debug" != "xno"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXFLAGS="$CFLAGS -g -DDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="$CXXFLAGS -g -DDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_debug="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>
</pre>