Bug #32877062 SWITCH TO GCC 8 ON UBUNTU 18.04

On Ubuntu 18, look for CC=/usr/bin/gcc-8 and CXX=/usr/bin/g++-8

Change-Id: I5e1ae755c604c888fd6ca2d367d0d993264dfa24

Author: Tor Didriksen

CMakeLists.txt

@@ -243,6 +243,22 @@ IF(MY_HOST_SYSTEM_NAME MATCHES "Linux")
   ENDIF()
 ENDIF()
 
+IF(NOT LINUX_RHEL AND MY_HOST_SYSTEM_NAME MATCHES "Linux")
+  IF(EXISTS "/etc/os-release")
+    FILE(READ "/etc/os-release" MY_OS_RELEASE)
+    IF(MY_OS_RELEASE MATCHES "Debian")
+      SET(LINUX_DEBIAN 1)
+    ELSEIF(MY_OS_RELEASE MATCHES "Ubuntu")
+      SET(LINUX_UBUNTU 1)
+      IF(MY_OS_RELEASE MATCHES "16.04")
+        SET(LINUX_UBUNTU_16_04 1)
+      ELSEIF(MY_OS_RELEASE MATCHES "18.04")
+        SET(LINUX_UBUNTU_18_04 1)
+      ENDIF()
+    ENDIF()
+  ENDIF()
+ENDIF()
+
 IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
@@ -281,6 +297,26 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
         MESSAGE(FATAL_ERROR "Please set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER explicitly.")
       ENDIF()
 
+    ELSEIF(LINUX_UBUNTU_18_04)
+      MESSAGE(STATUS "Looking for gcc-8 on Ubuntu 18.04")
+      FIND_PROGRAM(ALTERNATIVE_GCC gcc-8
+        NO_DEFAULT_PATH
+        PATHS "/usr/bin")
+      FIND_PROGRAM(ALTERNATIVE_GPP g++-8
+        NO_DEFAULT_PATH
+        PATHS "/usr/bin")
+      IF (ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
+        SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
+        SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})
+        MESSAGE(STATUS "Using ${ALTERNATIVE_GCC}")
+        MESSAGE(STATUS "Using ${ALTERNATIVE_GPP}")
+      ELSE()
+        MESSAGE(WARNING "Could not find gcc-8")
+        MESSAGE(FATAL_ERROR
+          "Please do 'apt install gcc-8 g++-8'\n"
+          "or set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER explicitly.")
+      ENDIF()
+
     ELSEIF(MY_HOST_SYSTEM_NAME MATCHES "Linux" AND
         EXISTS "/etc/os-release")
       FILE(READ "/etc/os-release" MY_OS_RELEASE)

cmake/os/Linux.cmake

@@ -52,19 +52,6 @@ IF(EXISTS "/etc/fedora-release")
   ENDIF()
 ENDIF()
 
-IF(EXISTS "/etc/os-release")
-  FILE(READ "/etc/os-release" MY_OS_RELEASE)
-  IF(MY_OS_RELEASE MATCHES "Ubuntu" AND
-      MY_OS_RELEASE MATCHES "16.04")
-    SET(LINUX_UBUNTU_16_04 1)
-  ENDIF()
-  IF(MY_OS_RELEASE MATCHES "Debian")
-    SET(LINUX_DEBIAN 1)
-  ELSEIF(MY_OS_RELEASE MATCHES "Ubuntu")
-    SET(LINUX_UBUNTU 1)
-  ENDIF()
-ENDIF()
-
 # We require at least GCC 5.3 or Clang 3.4.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(MY_COMPILER_IS_GNU)

packaging/deb-in/CMakeLists.txt

@@ -235,7 +235,11 @@ ENDIF()
 
 # Enable various apparmor systems for Ubuntu
 IF(DEB_ID STREQUAL "ubuntu")
-  SET (DEB_CONTROL_BDEPS ", dh-apparmor")
+  IF(DEB_CODENAME STREQUAL "bionic")
+    SET (DEB_CONTROL_BDEPS ", dh-apparmor, gcc-8, g++-8")
+  ELSE()
+    SET (DEB_CONTROL_BDEPS ", dh-apparmor")
+  ENDIF()
   SET (DEB_RULES_INSTALL_APPARMOR "install -g root -o root -m 0644 -D debian/extra/apparmor-profile debian/tmp/etc/apparmor.d/usr.sbin.mysqld")
   SET (DEB_RULES_APPARMOR_LOAD "dh_apparmor -pmysql-${DEB_PRODUCTNAME}-server --profile-name=usr.sbin.mysqld")
   SET (DEB_INSTALL_SERVER_APPARMOR "etc/apparmor.d/usr.sbin.mysqld")