From af40e18723a79ef1b8ef565e84abb4217a796a91 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:06:34 +0100 Subject: [PATCH] Update CI build script The code to remove incompatible libunwind development packages works, but only by chance. This update searches explicitly for incompatible packages and then removes them. --- scripts/install_pulseaudio_sources_apt.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/install_pulseaudio_sources_apt.sh b/scripts/install_pulseaudio_sources_apt.sh index 5e06c23..20633eb 100755 --- a/scripts/install_pulseaudio_sources_apt.sh +++ b/scripts/install_pulseaudio_sources_apt.sh @@ -98,15 +98,17 @@ if [ ! -d "$PULSE_DIR" ]; then sudo apt-get update - # For the CI build on 22.04, it was noted that an incompatible - # libunwind development package was installed. - if [ -f /usr/include/libunwind/libunwind.h ]; then - pkg=`dpkg -S /usr/include/libunwind/libunwind.h | sed -e 's/: .*//'` - if [ -n "$pkg" -a "$pkg" != libunwind-dev ]; then - echo "- Removing package $pkg" - sudo apt-get remove "$pkg" - fi + # For the CI build on 22.04, it was noted that an incompatible libunwind + # development package libunwind-14-dev was installed, which prevented + # installation of the default libunwind-dev package. + # + # Remove any libunwind-*-dev package + pkg_list=`dpkg-query -W -f '${Package} ' 'libunwind-*-dev' 2>/dev/null || :` + if [ -n "$pkg_list" ]; then + echo "- Removing package(s) $pkg_list" + sudo apt-get remove -y $pkg_list fi + sudo apt-get build-dep -y pulseaudio # Install any missing dependencies for this software release case "$RELEASE" in