Skip to content

Commit ef6a0af

Browse files
Use devtoolset-11 for el7 x86 and el8 all builds
1 parent 22d0010 commit ef6a0af

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
33
#
44
# This program is free software; you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License, version 2.0, as
@@ -37,8 +37,14 @@
3737
%{!?commercial: %global product_suffix %{nil}}
3838
%{?el6:%global __strip /opt/rh/devtoolset-8/root/usr/bin/strip}
3939
%{?el6:%global gcc_toolset devtoolset-8}
40+
41+
%ifarch aarch64
4042
%{?el7:%global gcc_toolset devtoolset-10}
41-
%{?el8:%global gcc_toolset gcc-toolset-10}
43+
%else
44+
%{?el7:%global gcc_toolset devtoolset-11}
45+
%endif
46+
47+
%{?el8:%global gcc_toolset gcc-toolset-11}
4248
%if 0%{?suse_version} == 1315
4349
%global dist .sles12
4450
%endif
@@ -160,6 +166,9 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
160166
%{_includedir}/mysql-cppconn-8/jdbc
161167

162168
%changelog
169+
* Tue Jan 25 2022 Prashant Tekriwal <[email protected]> - 8.0.29-1
170+
- Using devtoolset-11 for el7 x86 and el8(all)
171+
163172
* Tue Nov 09 2021 Gipson Pulla <[email protected]> - 8.0.28-1
164173
- Removed the internal testing package
165174

0 commit comments

Comments
 (0)