From: Andrew Lewis Date: Mon, 1 Dec 2025 10:10:14 +0000 (+0200) Subject: [Minor] Use gcc toolset at EL10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5771%2Fhead;p=thirdparty%2Frspamd.git [Minor] Use gcc toolset at EL10 --- diff --git a/rpm/rspamd.spec b/rpm/rspamd.spec index a0f3af20b1..3f9a3cb37b 100644 --- a/rpm/rspamd.spec +++ b/rpm/rspamd.spec @@ -21,12 +21,19 @@ BuildRequires: cmake3 BuildRequires: devtoolset-10-gcc-c++ %else BuildRequires: cmake +%endif %if 0%{?el8} BuildRequires: gcc-toolset-10-gcc-c++ %endif %if 0%{?el9} BuildRequires: gcc-toolset-12-gcc-c++ %endif +%if 0%{?el10} +BuildRequires: gcc-toolset-15 +BuildRequires: gcc-toolset-15-gcc-plugin-annobin +%if 0%{getenv:ASAN} +BuildRequires: gcc-toolset-15-libasan-devel +%endif %endif BuildRequires: file-devel BuildRequires: glib2-devel @@ -91,13 +98,15 @@ git clone -b v2.1 https://luajit.org/git/luajit-2.0.git %{_builddir}/luajit-src %build %if 0%{?el7} source /opt/rh/devtoolset-10/enable -%else +%endif %if 0%{?el8} source /opt/rh/gcc-toolset-10/enable %endif %if 0%{?el9} source /opt/rh/gcc-toolset-12/enable %endif +%if 0%{?el10} +source /usr/lib/gcc-toolset/15-env.source %endif %if 0%{getenv:LUAJIT}