Skip to content

Commit 65c5833

Browse files
author
Tor Didriksen
committed
Bug#26436968 SWITCH TO DEVTOOLSET 6 FOR EL6 AND EL7 FOR MYSQL 8.0
Post-push fix: update rpm spec for oel.
1 parent 2c8da37 commit 65c5833

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

packaging/rpm-oel/mysql.spec.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ Source7: %{compatsrc}
101101
Source10: http://downloads.sourceforge.net/boost/@[email protected]
102102
Source90: filter-provides.sh
103103
Source91: filter-requires.sh
104-
%{?el6:BuildRequires: devtoolset-3-gcc}
105-
%{?el6:BuildRequires: devtoolset-3-gcc-c++}
104+
BuildRequires: devtoolset-6-gcc
105+
BuildRequires: devtoolset-6-gcc-c++
106106
BuildRequires: cmake >= 2.8.2
107107
BuildRequires: perl
108108
%{?el7:BuildRequires: perl(Time::HiRes)}
@@ -592,9 +592,6 @@ fi
592592
%endif # 0%{?rhel} < 7
593593
%endif # 0%{?compatlib}
594594

595-
%{?el6:export CC=/opt/rh/devtoolset-3/root/usr/bin/gcc}
596-
%{?el6:export CXX=/opt/rh/devtoolset-3/root/usr/bin/g++}
597-
598595
# Build debug versions of mysqld
599596
mkdir debug
600597
(

0 commit comments

Comments
 (0)