From ec8f99585df15218c4104c32e99d1865906d0340 Mon Sep 17 00:00:00 2001 From: S-P Chan Date: Thu, 22 Jan 2026 14:22:02 +0800 Subject: [PATCH] MT#55283 Fix EL packaging Update build dependencies: - libjwt-devel - pcre2-devel - EL8: gcc-toolset-13-libatomic-devel; use gcc-toolset-13 also for the install stage Closes #2055 Change-Id: I54796d8f855357a31b2cc1abce31bdef5a5a92d8 --- el/rtpengine.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/el/rtpengine.spec b/el/rtpengine.spec index 2058fc21a..429505653 100644 --- a/el/rtpengine.spec +++ b/el/rtpengine.spec @@ -34,7 +34,8 @@ Conflicts: %{name}-kernel < %{version}-%{release} %endif BuildRequires: gcc make pkgconfig %{redhat_rpm_config} -BuildRequires: glib2-devel libcurl-devel openssl-devel pcre-devel +BuildRequires: glib2-devel libcurl-devel openssl-devel +BuildRequires: pcre2-devel BuildRequires: zlib-devel hiredis-devel %if 0%{?has_systemd_dirs} BuildRequires: systemd-devel @@ -44,19 +45,20 @@ BuildRequires: mosquitto-devel BuildRequires: gperf perl-IPC-Cmd BuildRequires: perl-podlators BuildRequires: libatomic +BuildRequires: libjwt-devel BuildRequires: %{mysql_devel_pkg} BuildRequires: pkgconfig(libwebsockets) BuildRequires: pkgconfig(spandsp) BuildRequires: pkgconfig(opus) %if 0%{?rhel} == 8 # LTS mr11.5.1 cannot build with gcc 8.5 -BuildRequires: gcc-toolset-13 +BuildRequires: gcc-toolset-13 gcc-toolset-13-libatomic-devel %endif Requires(pre): shadow-utils %if 0%{?rhel} >= 8 BuildRequires: pandoc ncurses-devel %endif -%if 0%{?rhel} >= 9 +%if 0%{?rhel} <= 9 BuildRequires: pkgconfig(libiptc) %endif @@ -141,6 +143,7 @@ echo ==== LDFLAGS = $LDFLAGS ==== # LTS mr11.5.1 cannot build with gcc 8.5 . /opt/rh/gcc-toolset-13/enable %endif + %if 0%{?with_transcoding} > 0 RTPENGINE_VERSION="\"%{version}-%{release}\"" make all %else @@ -154,6 +157,12 @@ RTPENGINE_VERSION="\"%{version}-%{release}\"" make with_transcoding=no all echo ---- CFLAGS = $CFLAGS ---- echo ---- CXXFLAGS = $CXXFLAGS ---- echo ---- LDFLAGS = $LDFLAGS ---- + +%if 0%{?rhel} == 8 +# LTS mr11.5.1 cannot build with gcc 8.5 +. /opt/rh/gcc-toolset-13/enable +%endif + # Install the userspace daemon %if 0%{?with_transcoding} > 0 RTPENGINE_VERSION="\"%{version}-%{release}\"" make DESTDIR=%{buildroot} install