Compare commits

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

3 commits

Author SHA1 Message Date
Troy Dawson
19481f21c1 fix gcc-toolset-12-binutils-gold 2023-05-08 11:27:32 -07:00
Troy Dawson
cf9e5e80d9 Fix typo 2023-05-05 14:34:22 -07:00
Troy Dawson
1bfdeddb39 Use system libraries on rhel9+ 2023-05-05 14:32:19 -07:00

View file

@ -9,7 +9,7 @@
# where qt5-qttools (qt5-doctools) builds are not yet available
%global docs 0
%if 0%{?fedora}
%if 0%{?fedora} || 0%{?epel} >= 9
# need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
%global use_system_libvpx 1
# For screen sharing on Wayland, currently Fedora only thing - no epel
@ -19,14 +19,10 @@
# need libwebp >= 0.6.0
%global use_system_libwebp 1
%global use_system_jsoncpp 1
%if 0%{?rhel} && 0%{?rhel} == 9
%global use_system_re2 0
%else
%global use_system_re2 1
%endif
%endif
%if 0%{?fedora} > 32
%if 0%{?fedora} > 32 || 0%{?epel} >= 9
# need libicu >= 65, only currently available on f33+
%global use_system_libicu 1
%endif
@ -128,6 +124,9 @@ Patch35: qt5-qtwebengine-c99.patch
ExclusiveArch: %{qt5_qtwebengine_arches}
%endif
# Build on CentOS Stream 9 pulls in old gcc-toolset-12-binutils-gold
# Remove this when version 2.38-14 is no longer pulled in.
BuildRequires: gcc-toolset-12-binutils-gold >= 2.38-16
BuildRequires: make
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel
@ -295,7 +294,7 @@ Provides: bundled(libsrtp) = 2.2.0
Provides: bundled(libvpx) = 1.8.2
%endif
%if !0%{?use_system_libwebp}
Provides: bundled(libwebp) = 1.1.0-28-g55a080e5
Provides: bundled(libwebp) = 1.1.0-28.g55a080e5
%endif
# bundled as "libxml"
# see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h