Skip to content

Commit af5e112

Browse files
committed
packaging: Do not select compiler toolset in the RPM spec file
Note: Instead correct compiler version should be set-up before invoking RPM build.
1 parent c5b141a commit af5e112

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@
3939
%{?commercial: %global license_type Commercial}
4040
%{?commercial: %global product_suffix -commercial}
4141
%{!?commercial: %global product_suffix %{nil}}
42-
%{?el6:%global __strip /opt/rh/devtoolset-8/root/usr/bin/strip}
43-
%{?el6:%global gcc_toolset devtoolset-8}
44-
45-
%ifarch aarch64
46-
%{?el7:%global gcc_toolset devtoolset-10}
47-
%else
48-
%{?el7:%global gcc_toolset devtoolset-11}
49-
%endif
50-
51-
%{?el8:%global gcc_toolset gcc-toolset-13}
52-
%{?el9:%global gcc_toolset gcc-toolset-13}
5342

5443
%global cmake_cmd cmake%{?el6:3}%{?el7:3}
5544

@@ -95,12 +84,8 @@ Source1: https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connecto
9584
%endif
9685

9786
BuildRequires: %{cmake_cmd} >= 3.15.0
98-
%if 0%{?fedora} || 0%{?suse_version}
9987
BuildRequires: gcc
10088
BuildRequires: gcc-c++
101-
%endif
102-
%{?gcc_toolset:BuildRequires: %{gcc_toolset}-gcc}
103-
%{?gcc_toolset:BuildRequires: %{gcc_toolset}-gcc-c++}
10489
BuildRequires: openssl-devel
10590

10691
%description
@@ -174,8 +159,6 @@ cd ${RPM_BUILD_DIR}
174159

175160
%global plugin_dir %{_libdir}/mysql/%{lib_base_name_jdbc}/plugin
176161

177-
%{?gcc_toolset:source /opt/rh/%{gcc_toolset}/enable}
178-
179162
%if 0%{?with_tests:1} && 0%{?with_gtest:1}
180163
%global __cmake_test_opts -DWITH_TESTS=1 -DWITH_GTEST=%{with_gtest}
181164
%else

0 commit comments

Comments
 (0)