From 9dde866843e1d9f5a02cc6b1a4516150d83ef106 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 28 Apr 2020 12:19:11 +0200 Subject: [PATCH] Back to devtoolset-7 --- vlc.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index e2cccc7..1a1e289 100644 --- a/vlc.spec +++ b/vlc.spec @@ -230,7 +230,7 @@ BuildRequires: raspberrypi-vc-static } %if 0%{?el7} -BuildRequires: devtoolset-8-toolchain, devtoolset-8-libatomic-devel +BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel %endif %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -330,7 +330,7 @@ sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_c sed -i -e 's/ header.channel_mapping,//' modules/codec/opus.c # Lower taglib sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac -. /opt/rh/devtoolset-8/enable +. /opt/rh/devtoolset-7/enable %endif %{?_with_bootstrap: @@ -343,7 +343,7 @@ touch src/revision.txt %build %if 0%{?el7} -. /opt/rh/devtoolset-8/enable +. /opt/rh/devtoolset-7/enable %endif %configure \ @@ -598,6 +598,7 @@ fi || : %changelog * Tue Apr 28 2020 Nicolas Chauvet - 1:3.0.10-1 - Update to 3.0.10 +- Back to devtoolset-7 for EL7 * Fri Apr 24 2020 Leigh Scott - 1:3.0.9.2-3 - Fix srt issue (rfbz#5614)