From 97df3c7e1b76280d7e31caf78166b0e08974a224 Mon Sep 17 00:00:00 2001 From: Andrew Solovjov Date: Thu, 28 Nov 2024 15:29:41 +0300 Subject: [PATCH] MT#55283 Fix EL build errors * Added libatomic to the el/ build dependencies. This was required since commit 741f6ac when -latomic was added to lib/common.Makefile * Changed link to the copr repo with spandsp3. There is seperate repo for EL9 now. Closes #1880 Change-Id: I9ba2246bd0f2fa6f2d6196d6c66a527f5f1dd3f0 (cherry picked from commit f07dd416e05c2cb6494b859c323b7649322d1711) (cherry picked from commit 16235326d08da863e282de1c4798a960daed90da) --- el/rtpengine-8-x86_64.cfg | 4 ++-- el/rtpengine-9-x86_64.cfg | 4 ++-- el/rtpengine.spec | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/el/rtpengine-8-x86_64.cfg b/el/rtpengine-8-x86_64.cfg index 1af009bb1..7c5ec30e9 100644 --- a/el/rtpengine-8-x86_64.cfg +++ b/el/rtpengine-8-x86_64.cfg @@ -17,7 +17,7 @@ enabled=1 [copr:copr.fedorainfracloud.org:beaveryoga:broadvoice] name=Copr repo for broadvoice owned by beaveryoga -baseurl=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/epel-8-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/epel-$releasever-$basearch/ skip_if_unavailable=True gpgcheck=1 gpgkey=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/pubkey.gpg @@ -27,7 +27,7 @@ enabled_metadata=1 """ config_opts['chroot_additional_packages'] = "perl-interpreter libdb-devel gdbm-devel libuuid-devel speexdsp-devel" -config_opts['chroot_additional_packages'] += " spandsp3-devel perl-podlators pandoc" +config_opts['chroot_additional_packages'] += " spandsp3-devel perl-podlators pandoc libatomic" config_opts['root'] = 'rtpengine-8-x86_64' config_opts['target_arch'] = 'x86_64' diff --git a/el/rtpengine-9-x86_64.cfg b/el/rtpengine-9-x86_64.cfg index 591f88323..9d8196618 100644 --- a/el/rtpengine-9-x86_64.cfg +++ b/el/rtpengine-9-x86_64.cfg @@ -17,7 +17,7 @@ enabled=1 [copr:copr.fedorainfracloud.org:beaveryoga:broadvoice] name=Copr repo for broadvoice owned by beaveryoga -baseurl=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/epel-8-$basearch/ +baseurl=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/epel-$releasever-$basearch/ skip_if_unavailable=True gpgcheck=1 gpgkey=https://download.copr.fedorainfracloud.org/results/beaveryoga/broadvoice/pubkey.gpg @@ -28,7 +28,7 @@ enabled_metadata=1 config_opts['chroot_additional_packages'] = "perl-interpreter libdb-devel gdbm-devel libuuid-devel speexdsp-devel" config_opts['chroot_additional_packages'] += " spandsp3-devel perl-podlators pandoc" -config_opts['chroot_additional_packages'] += " gcc make autoconf automake gcc-c++ libtool" +config_opts['chroot_additional_packages'] += " gcc make autoconf automake gcc-c++ libtool libatomic" config_opts['root'] = 'rtpengine-9-x86_64' config_opts['target_arch'] = 'x86_64' diff --git a/el/rtpengine.spec b/el/rtpengine.spec index 692111dec..8efc10bfa 100644 --- a/el/rtpengine.spec +++ b/el/rtpengine.spec @@ -34,6 +34,7 @@ BuildRequires: libpcap-devel libevent-devel json-glib-devel BuildRequires: mosquitto-devel BuildRequires: gperf perl-IPC-Cmd BuildRequires: perl-podlators +BuildRequires: libatomic BuildRequires: pkgconfig(libwebsockets) BuildRequires: pkgconfig(spandsp) BuildRequires: pkgconfig(opus)