ET#67880 Update the compilers to match server builds

Author: sreedhars

packaging/mysql-connector-c++.spec.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -26,30 +26,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-
-# Arguments that can be fiven to "rpmbuild"
+# Arguments that can be given to rpmbuild:
 #
 #  mysql_dir     Path to the MySQL installation, where to find the client lib
 #  commercial    If set, is a commercial build
-
 %{?mysql_dir:    %global mysql_opt -DMYSQL_DIR=%{mysql_dir}}
 %{!?commercial:  %global license_type GPLv2}
 %{?commercial:   %global license_type Commercial}
 %{?commercial:   %global product_suffix -commercial}
 %{!?commercial:  %global product_suffix %{nil}}
-
 %{?el6:%global __strip /opt/rh/devtoolset-8/root/usr/bin/strip}
-
 %if 0%{?suse_version} == 1315
 %global dist            .sles12
 %endif
-
 %if 0%{?suse_version} == 1500
 %global dist            .sl15
 %endif
-
 %global source_date_epoch_from_changelog 0
-
 Summary:        MySQL database connector for C++
 Name:           mysql-connector-c++%{?product_suffix}
 Version:        @CONCPP_VERSION@
@@ -63,19 +56,21 @@ BuildRequires:  cmake3
 %else
 BuildRequires:  cmake
 %endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8
+%if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-%else
-BuildRequires:  devtoolset-8-gcc
-BuildRequires:  devtoolset-8-gcc-c++
 %endif
+%{?el6:BuildRequires: devtoolset-8-gcc}
+%{?el6:BuildRequires: devtoolset-8-gcc-c++}
+%{?el7:BuildRequires: devtoolset-9-gcc}
+%{?el7:BuildRequires: devtoolset-9-gcc-c++}
+%{?el8:BuildRequires: gcc-toolset-9-gcc}
+%{?el8:BuildRequires: gcc-toolset-9-gcc-c++}
 %{!?mysql_dir:BuildRequires: mysql-devel}
 BuildRequires:  openssl-devel
 %{?commercial:Obsoletes: mysql-connector-c++ < %{version}-%{release}}
 %description
 A C++ interface for communicating with MySQL servers.
-
 %package        jdbc
 Summary:        MySQL Driver for C++ which mimics the JDBC 4.0 API
 %{?commercial:Obsoletes: mysql-connector-c++-jdbc < %{version}-%{release}}
@@ -85,7 +80,6 @@ Provides:       libmysqlcppconn7 = %{version}-%{release}
 Provides:       libmysqlcppconn-devel = %{version}-%{release}
 %description    jdbc
 This MySQL Driver for C++ mimics the JDBC 4.0 API.
-
 %package        devel
 Summary:        Development header files and libraries for MySQL C++ client applications
 %if 0%{?commercial}
@@ -99,7 +93,6 @@ Requires:       mysql-connector-c++-jdbc =  %{version}-%{release}
 %description    devel
 This package contains the development header files and libraries necessary
 to develop MySQL client applications in C++.
-
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 %package        test
 Summary:        Regression tests for MySQL Connector/C++
@@ -115,46 +108,39 @@ Requires:       mysql-connector-c++-jdbc =  %{version}-%{release}
 This package contains the test files necessary to run regression
 test suite for MySQL Connector/C++
 %endif
-
 %prep
 %setup -q -n mysql-connector-c++%{product_suffix}-%{version}-src
-
 %build
-%if 0%{?rhel} < 8
-%{?rhel:export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc}
-%{?rhel:export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++}
-%endif
-
+%{?el6:export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc}
+%{?el6:export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++}
+%{?el7:export CC=/opt/rh/devtoolset-9/root/usr/bin/gcc}
+%{?el7:export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++}
+%{?el8:export CC=/opt/rh/gcc-toolset-9/root/usr/bin/gcc}
+%{?el8:export CXX=/opt/rh/gcc-toolset-9/root/usr/bin/g++}
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 %global __cmake_test_opts -DWITH_TESTS=1 -DWITH_GTEST=%{with_gtest}
 %else
 %global __cmake_test_opts %{nil}
 %endif
-
 %global __cmake_explicit_opts -DCMAKE_INSTALL_PREFIX="%_prefix" -DCMAKE_C_FLAGS:STRING="%optflags" -DCMAKE_CXX_FLAGS:STRING="%optflags"
 %global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
-
 %if 0%{?rhel}
 %global __cmake_cmd cmake3 %{__cmake_common_opts} %{__cmake_explicit_opts} ..
 %else
 %global __cmake_cmd cmake %{__cmake_common_opts} %{__cmake_explicit_opts} ..
 %endif
-
 mkdir build-dynamic && pushd build-dynamic
 pwd
 %__cmake_cmd
 make %{?_smp_mflags} VERBOSE=1
 popd
-
 mkdir build-static && pushd build-static
 %__cmake_cmd -DBUILD_STATIC=ON
 make %{?_smp_mflags} VERBOSE=1
 popd
-
 %install
 pushd build-dynamic
 make DESTDIR=%{buildroot} install
-
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 # Generating the test groups and run CMake again
 # to process the generated TestGroups.cmake file
@@ -166,10 +152,8 @@ mv CTestTestfile.cmake %{buildroot}%{_libdir}/mysql-cppconn-8/dynamic/
 mv run_unit_tests      %{buildroot}%{_libdir}/mysql-cppconn-8/dynamic/
 %endif
 popd
-
 pushd build-static
 make DESTDIR=%{buildroot} install
-
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 # Generating the test groups and run CMake again
 # to process the generated TestGroups.cmake file
@@ -181,25 +165,19 @@ mv CTestTestfile.cmake %{buildroot}%{_libdir}/mysql-cppconn-8/static/
 mv run_unit_tests      %{buildroot}%{_libdir}/mysql-cppconn-8/static/
 %endif
 popd
-
 # Add compat dir and remove unwanted file
 ln -s mysql-cppconn-8 %{buildroot}%{_includedir}/mysql-cppconn
 rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-
 %post jdbc -p /sbin/ldconfig
 %postun jdbc -p /sbin/ldconfig
-
 %files
 %doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn8.so.@ABI_VERSION_MAJOR@*
-
 %files jdbc
 %doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn.so.@JDBC_ABI_VERSION_MAJOR@*
-
 %files devel
 %doc README.txt LICENSE.txt INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn.so
@@ -211,7 +189,6 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
 %{_includedir}/mysql-cppconn-8/mysqlx
 %{_includedir}/mysql-cppconn-8/mysql
 %{_includedir}/mysql-cppconn-8/jdbc
-
 %if 0%{?with_tests:1} && 0%{?with_gtest:1}
 %files test
 %dir %{_libdir}/mysql-cppconn-8
@@ -222,30 +199,25 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
 %{_libdir}/mysql-cppconn-8/static/run_unit_tests
 %{_libdir}/mysql-cppconn-8/static/CTestTestfile.cmake
 %endif
-
 %changelog
+* Thu Jun 04 2020 Sreedhar S <[email protected]> - 8.0.22-1
+- Updated the compliers for el|678 to match server builds
 * Thu Jun 04 2020 Gipson Pulla <[email protected]> - 8.0.21-1
 - Updated the macro to use the system date
-
 * Fri Feb 15 2019 Bjorn Munch <[email protected]> - 8.0.16-1
 - CMake 3 should not be used on Fedora, only on Oracle Linux or Red Hat
 - Removed use of cmake_path as it is no longer needed
-
 * Thu Feb 14 2019 Rafal Somla <[email protected]>
 - Use ABI version number taken from version.cmake in %files patterns
-
 * Fri Dec 14 2018 Kent Boortz <[email protected]> - 8.0.15-1
 - Use CMake 3 on Fedora and Oracle Linux
 - Added option to specify what CMake to use, "--define 'cmake_path <path>'"
-
 * Tue Nov 27 2018 Balasubramanian Kandasamy <[email protected]> - 8.0.14-1
 - Added INFO_BIN and INFO_SRC files
-
 * Fri Aug 24 2018 Kent Boortz <[email protected]> - 8.0.13-1
 - Added "test" package
-
 * Wed May 16 2018 Balasubramanian Kandasamy <[email protected]> - 8.0.11-1
 - Adapt to MySQL Connector C++ 8.0
-
 * Tue Apr 05 2016 Kent Boortz <[email protected]> - 2.0.1-1
 - initial package
+Collapse