Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RPM spec: use full toolchain from devtoolset, not just gcc; use gcc 11

Browse Source
This commit is contained in:
Moritz Bunkus 2021-12-20 19:35:43 +01:00
parent 63b2eb4b08
commit f745178c2a
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packaging/centos-fedora-opensuse/mkvtoolnix.spec
View File

@ -41,7 +41,7 @@ BuildRequires: boost169-devel
BuildRequires: devtoolset-10-gcc-c++
%else
BuildRequires: boost-devel >= 1.66.0
BuildRequires: gcc-toolset-10-gcc-c++
BuildRequires: gcc-toolset-11-gcc-c++
%endif
%else
BuildRequires: boost-devel >= 1.66.0
@ -82,15 +82,15 @@ export CXXFLAGS="%{optflags}"
unset CONFIGURE_ARGS
%if 0%{?rhel} && 0%{?rhel} <= 7
export CC=/opt/rh/devtoolset-10/root/bin/gcc
export CXX=/opt/rh/devtoolset-10/root/bin/g++
export CPPFLAGS="${CPPFLAGS} -I/usr/include/boost169"
export CONFIGURE_ARGS="--with-boost-libdir=/usr/lib64/boost169"
%endif
%if 0%{?rhel} && 0%{?rhel} >= 8
export CC=/opt/rh/gcc-toolset-10/root/bin/gcc
export CXX=/opt/rh/gcc-toolset-10/root/bin/g++
%endif
for SUB_DIR in gcc-toolset-11 gcc-toolset 10 devtoolset-10; do
if test -x /opt/rh/$SUB_DIR/root/bin/gcc; then
source /opt/rh/$SUB_DIR/enable
break
fi
done
%configure \
--disable-optimization \