Compare commits

...
Sign in to create a new pull request.

17 commits

Author SHA1 Message Date
Troy Dawson
c88d558ed0 rhel9 needs gcc-toolset-13 2024-03-20 14:06:01 -07:00
Troy Dawson
1fd9f02297 Merge branch f39 into epel9-next 2024-03-20 13:51:57 -07:00
Troy Dawson
4e797dfa1c Merge branch f38 into epel9 2023-09-19 07:03:50 -07:00
Jan Grulich
d6c2c9be30 Merge branch 'f39' into f38 2023-09-19 09:03:33 +02:00
Jan Grulich
39cf5491b2 Merge branch 'rawhide' into f38 2023-07-25 11:25:13 +02:00
Jan Grulich
47fcb436c6 Merge branch 'rawhide' into f38 2023-07-12 23:02:23 +02:00
Troy Dawson
c08934a31c Use gcc-toolset-12 2023-05-27 12:12:21 -07:00
Jan Grulich
4ad31b1390 Merge branch 'rawhide' into f38 2023-05-26 08:53:06 +02:00
Troy Dawson
34d307e798 does not like RHEL icu 2023-05-10 07:04:33 -07:00
Jan Grulich
f23b1bec9a Merge branch 'rawhide' into f38 2023-04-25 14:57:29 +02:00
Jan Grulich
75bc5c6299 Merge branch 'f38' into f37 2023-04-03 12:20:26 +02:00
Jan Grulich
0a649da59a Fix changelog 2023-03-27 14:55:25 +02:00
Jan Grulich
94878c13b7 Fix bad merge 2023-03-27 14:21:19 +02:00
Jan Grulich
eba5422a14 Merge branch 'rawhide' into f38 2023-03-27 14:15:18 +02:00
Neal Gompa
1ecc43b03e Rebuild for ffmpeg 6.0 2023-03-12 13:35:33 -04:00
Marek Kasik
5cad61b2fb Rebuild for freetype-2.13.0 2023-02-26 22:01:59 +01:00
Jan Grulich
59b334d37d Rebuild for Qt 6.4.2 update 2023-01-26 10:26:28 +01:00

View file

@ -115,7 +115,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc-c++
%if 0%{?rhel} && 0%{?rhel} < 10
BuildRequires: gcc-toolset-12
BuildRequires: gcc-toolset-13
%endif
# gn links statically (for now)
BuildRequires: libstdc++-static
@ -415,7 +415,7 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
%build
%if 0%{?rhel} && 0%{?rhel} < 10
. /opt/rh/gcc-toolset-12/enable
. /opt/rh/gcc-toolset-13/enable
%endif
export STRIP=strip
export NINJAFLAGS="%{__ninja_common_opts}"