mysql57: fix building with GCC

3 files changed, 28 insertions, 3 deletions

diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index ba17bc468be..635a60aff27 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2021/04/21 13:26:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2021/04/29 16:50:32 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
@@ -66,7 +66,7 @@ CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
 CMAKE_ARGS+=	-DWITH_BOOST="system"
 CMAKE_ARGS+=	-DWITH_EDITLINE="system"
-CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline:Q}/${BUILDLINK_INCDIRS.editline}
+CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
 CMAKE_ARGS+=	-DWITH_LIBEVENT="system"
 CMAKE_ARGS+=	-DWITH_LZ4="system"
 CMAKE_ARGS+=	-DWITH_SSL="system"
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index 125fff62c19..2dfe7aa2974 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2021/04/21 13:26:54 adam Exp $
+$NetBSD: distinfo,v 1.42 2021/04/29 16:50:32 adam Exp $
 
 SHA1 (mysql-5.7.34.tar.gz) = d1842baea3abc4b4cd684186e88b123d854d4ed7
 RMD160 (mysql-5.7.34.tar.gz) = f23902a074cb7bcd05dc7ef8c04186021c4d689c
@@ -9,6 +9,7 @@ SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
+SHA1 (patch-cmake_build__configurations_compiler__options.cmake) = 999110815237c53a69c74c42e66c45df83cbf355
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_curl.cmake) = 08ff31eb8de6b94a46ff90edb6df66a61a94fd9d
 SHA1 (patch-cmake_ldap.cmake) = 9bdc3c311330852286838e6159295ecc5fbdc0ea
diff --git a/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake
new file mode 100644
index 00000000000..a60b1b61102
--- /dev/null
+++ b/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_build__configurations_compiler__options.cmake,v 1.1 2021/04/29 16:50:32 adam Exp $
+
+Require C++14.
+
+--- cmake/build_configurations/compiler_options.cmake.orig	2021-04-29 13:13:28.501383898 +0000
++++ cmake/build_configurations/compiler_options.cmake
+@@ -73,7 +73,7 @@ IF(UNIX)  
+     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+                     OUTPUT_VARIABLE GXX_VERSION)
+     IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
+-      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
++      STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++14 ")
+     ENDIF()
+     # Disable inline optimizations for valgrind testing to avoid false positives
+     IF(WITH_VALGRIND)
+@@ -112,7 +112,7 @@ IF(UNIX)  
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
+         CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
+       IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-        STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++03 ")
++        STRING_PREPEND(COMMON_CXX_FLAGS "-std=gnu++14 ")
+       ENDIF()
+     ENDIF()
+     IF(NOT DISABLE_SHARED)