Bug#28561489: SWITCH TO DEVTOOLSET 7 TO BUILD MYSQL 8.0 ON OL7 AARCH64

Switch back to Devtoolset 7 on OL7 for ARM64 as special
handling of the armtoolset is not required.

Change-Id: I202058a9be5c80db5333f5ba0c4ea239a936f344

Author: jhauglid

CMakeLists.txt

@@ -168,17 +168,6 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
         FIND_PROGRAM(ALTERNATIVE_ENABLE enable
           NO_DEFAULT_PATH
           PATHS "/opt/rh/devtoolset-7/")
-        # On Oracle Linux ARM64 there is no /opt/rh/devtoolset-7
-        # look in /opt/oracle/oracle-armtoolset-1/root/usr/bin
-        FIND_PROGRAM(ALTERNATIVE_GCC gcc
-          NO_DEFAULT_PATH
-          PATHS "/opt/oracle/oracle-armtoolset-1/root/usr/bin")
-        FIND_PROGRAM(ALTERNATIVE_GPP g++
-          NO_DEFAULT_PATH
-          PATHS "/opt/oracle/oracle-armtoolset-1/root/usr/bin")
-        FIND_PROGRAM(ALTERNATIVE_ENABLE enable
-          NO_DEFAULT_PATH
-          PATHS "/opt/oracle/oracle-armtoolset-1/")
         IF(ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
           SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
           SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})

cmake/os/Linux.cmake

@@ -31,38 +31,6 @@ IF(EXISTS "/etc/alpine-release")
   SET(LINUX_ALPINE 1)
 ENDIF()
 
-# Non-standard installation of gcc and libraries, add explicit dependencies.
-IF(EXISTS "/etc/oracle-release" AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
-  IF(ALTERNATIVE_ENABLE)
-    # Execute the enable script, to get LD_LIBRARY_PATH
-    SET(ENABLEWRAPPER_CONTENT "#!/bin/bash\n")
-    SET(ENABLEWRAPPER_FILE "${CMAKE_CURRENT_BINARY_DIR}/enablewrapper.sh")
-    STRING_APPEND(ENABLEWRAPPER_CONTENT "source ${ALTERNATIVE_ENABLE}\n")
-    STRING_APPEND(ENABLEWRAPPER_CONTENT "echo \$LD_LIBRARY_PATH\n")
-    CONFIGURE_FILE_CONTENT(${ENABLEWRAPPER_CONTENT} ${ENABLEWRAPPER_FILE})
-    EXECUTE_PROCESS(COMMAND chmod +x ${ENABLEWRAPPER_FILE})
-
-    EXECUTE_PROCESS(COMMAND ${ENABLEWRAPPER_FILE}
-      OUTPUT_VARIABLE LD_LIBRARY_PATH
-      RESULT_VARIABLE result
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-
-    STRING(REPLACE ":" ";" LD_LIBRARY_PATH_LIST ${LD_LIBRARY_PATH})
-    FOREACH(path ${LD_LIBRARY_PATH_LIST})
-      IF(${path} MATCHES ${DEVTOOLSET_ROOT})
-        MESSAGE(STATUS "Adding link path ${path}")
-        STRING_APPEND(CMAKE_C_LINK_FLAGS " -L${path} -Wl,-R${path}")
-        STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -L${path} -Wl,-R${path}")
-        STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS " -L${path} -Wl,-R${path}")
-        STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS " -L${path} -Wl,-R${path}")
-        STRING_APPEND(QUOTED_CMAKE_CXX_LINK_FLAGS " -L${path} -Wl,-R${path} ")
-        LIST(APPEND CMAKE_REQUIRED_LIBRARIES "-L${path}" "-Wl,-R${path}")
-      ENDIF()
-    ENDFOREACH()
-  ENDIF()
-ENDIF()
-
 # We require at least GCC 4.8.3 or Clang 3.4.
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(CMAKE_COMPILER_IS_GNUCC)

packaging/rpm-docker/mysql.spec.in

@@ -58,13 +58,8 @@ Vendor:         %{mysql_vendor}
 Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 Source1:        https://downloads.sourceforge.net/boost/@[email protected]
 BuildRequires:  cmake >= 2.8.2
-%ifarch aarch64
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
 BuildRequires:  devtoolset-7-gcc
 BuildRequires:  devtoolset-7-gcc-c++
-%endif
 BuildRequires:  perl
 BuildRequires:  perl(Time::HiRes)
 BuildRequires:  perl(Env)

packaging/rpm-oel/mysql.spec.in

@@ -102,13 +102,8 @@ Source7:        %{compatsrc}
 Source10:       https://downloads.sourceforge.net/boost/@[email protected]
 Source90:       filter-provides.sh
 Source91:       filter-requires.sh
-%if 0%{?ol7} && "%{?_arch}" == "aarch64"
-BuildRequires:  oracle-armtoolset-1-gcc
-BuildRequires:  oracle-armtoolset-1-gcc-c++
-%else
 BuildRequires:  devtoolset-7-gcc
 BuildRequires:  devtoolset-7-gcc-c++
-%endif
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  perl
 %{?el7:BuildRequires: perl(Env)}