Fix SDRplay CI build on all linux distros

AlexandreRouma · Feb 13, 2025 · 32b2899 · 32b2899
1 parent 5178de0
commit 32b2899
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/docker_builds/debian_bookworm/do_build.sh b/docker_builds/debian_bookworm/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev l
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh
@@ -15,10 +15,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev
             libcodec2-dev libudev-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install a more recent libusb version

diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/ubuntu_jammy/do_build.sh b/docker_builds/ubuntu_jammy/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/ubuntu_noble/do_build.sh b/docker_builds/ubuntu_noble/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev l
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus

diff --git a/docker_builds/ubuntu_oracular/do_build.sh b/docker_builds/ubuntu_oracular/do_build.sh
@@ -9,10 +9,11 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev l
             libcodec2-dev autoconf libtool xxd libspdlog-dev
 
 # Install SDRPlay libraries
+SDRPLAY_ARCH=$(dpkg --print-architecture)
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1.run
 7z x ./SDRplay_RSP_API-Linux-3.15.1
-cp x86_64/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
+cp $SDRPLAY_ARCH/libsdrplay_api.so.3.15 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus