Skip to content

Commit 375c51a

Browse files
ltangvaldprashanttekriwal
authored andcommitted
Disable maintainer mode for debug build on Ubuntu 17.10
The platform comes with GCC 7.2, which has new warnings causing build failures with MYSQL_MAINTAINER_MODE=1 (cherry picked from commit e81de883489098c91c6d3f3484da8cf22a4168a6)
1 parent 9987c45 commit 375c51a

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

packaging/deb-in/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ ELSEIF(DEB_CODENAME STREQUAL "artful")
286286
SET (DEB_SERVICE_SERVER_EXECPRE
287287
"ExecStartPre=/usr/share/mysql/mysql-systemd-start pre")
288288
SET (DEB_INIT_APPARMOR "/lib/apparmor/profile-load usr.sbin.mysqld")
289+
IF (DEFINED WITH_NDBCLUSTER_STORAGE_ENGINE)
290+
# Cluster code triggers a lot of new warnings with GCC 7.2
291+
SET (DEB_DEBUG_MAINTAINER "-DMYSQL_MAINTAINER_MODE=0")
292+
ENDIF()
289293
ELSE()
290294
MESSAGE(STATUS
291295
"Skipping deb packaging on unsupported platform ${DEB_CODENAME}.")

packaging/deb-in/deb_debug.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ SET (DEB_RULES_DEBUG_CMAKE
2020
-DBUILD_CONFIG=mysql_release \\
2121
-DCMAKE_INSTALL_PREFIX=/usr \\
2222
-DCMAKE_BUILD_TYPE=Debug \\
23+
${DEB_DEBUG_MAINTAINER} \\
2324
-DINSTALL_DOCDIR=share/mysql/docs \\
2425
-DINSTALL_DOCREADMEDIR=share/mysql \\
2526
-DINSTALL_INCLUDEDIR=include/mysql \\

0 commit comments

Comments
 (0)