ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix docker tools and drivers for AMD cpu. 

The build is prepared on Intel CPU.
acarsdec and perseus driver are using -march=native, which results in
some wrong opcodes for AMD cpus.
Changing to -march=x86-64 will fix the problem.
This commit is contained in:
Stanislav Lechev [0xAF] 2023-10-09 01:08:38 +03:00
parent ef9618a4bb
commit 0c566ee5ac
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/deb_based/install-owrxp-extra.sh
View File

@ -19,6 +19,7 @@ function cmakebuild() {
rm -rf $1 rm -rf $1
} }
export MARCH=native
case `uname -m` in case `uname -m` in
arm*) arm*)
SDRPLAY_BINARY=SDRplay_RSP_API-ARM32-3.07.2.run SDRPLAY_BINARY=SDRplay_RSP_API-ARM32-3.07.2.run
@ -28,6 +29,7 @@ case `uname -m` in
;; ;;
x86_64*) x86_64*)
SDRPLAY_BINARY=SDRplay_RSP_API-Linux-3.07.1.run SDRPLAY_BINARY=SDRplay_RSP_API-Linux-3.07.1.run
export MARCH=x86-64
;; ;;
esac esac
@ -52,6 +54,7 @@ git clone https://github.com/Microtelecom/libperseus-sdr.git
cd libperseus-sdr cd libperseus-sdr
# latest from master as of 2020-09-04 # latest from master as of 2020-09-04
git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b
sed -i 's/-march=native/-march='${MARCH}'/g' configure.ac
./bootstrap.sh ./bootstrap.sh
./configure ./configure
make make
@ -108,6 +111,7 @@ git clone https://github.com/szpajder/libacars.git
cmakebuild libacars v2.1.4 cmakebuild libacars v2.1.4
git clone https://github.com/TLeconte/acarsdec.git git clone https://github.com/TLeconte/acarsdec.git
sed -i 's/-march=native/-march='${MARCH}'/g' acarsdec/CMakeLists.txt
cmakebuild acarsdec cmakebuild acarsdec
echo "+ Install HFDL..." echo "+ Install HFDL..."

3
docker/scripts/add-dependencies.sh
View File

@ -26,6 +26,7 @@ apt-get update
apt-get -y install auto-apt-proxy apt-get -y install auto-apt-proxy
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
export MARCH=x86-64
case `uname -m` in case `uname -m` in
arm*) arm*)
PLATFORM=armhf PLATFORM=armhf
@ -35,6 +36,7 @@ case `uname -m` in
;; ;;
x86_64*) x86_64*)
PLATFORM=amd64 PLATFORM=amd64
export MARCH=x86-64
;; ;;
esac esac
@ -121,6 +123,7 @@ git clone https://github.com/szpajder/libacars.git
cmakebuild libacars v2.1.4 cmakebuild libacars v2.1.4
git clone https://github.com/TLeconte/acarsdec.git git clone https://github.com/TLeconte/acarsdec.git
sed -i 's/-march=native/-march='${MARCH}'/g' acarsdec/CMakeLists.txt
cmakebuild acarsdec cmakebuild acarsdec
git clone https://github.com/szpajder/dumphfdl.git git clone https://github.com/szpajder/dumphfdl.git

10
docker/scripts/install-100-dependencies-perseus.sh
View File

@ -6,6 +6,15 @@ cd /tmp
STATIC_PACKAGES="libusb-1.0-0 libudev1" STATIC_PACKAGES="libusb-1.0-0 libudev1"
BUILD_PACKAGES="git make gcc autoconf automake libtool libusb-1.0-0-dev xxd" BUILD_PACKAGES="git make gcc autoconf automake libtool libusb-1.0-0-dev xxd"
export MARCH=native
case `uname -m` in
x86_64*)
export MARCH=x86-64
;;
esac
if [[ -z ${1:-} ]]; then if [[ -z ${1:-} ]]; then
apt-get update apt-get update
apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
@ -14,6 +23,7 @@ if [[ -z ${1:-} ]]; then
cd libperseus-sdr cd libperseus-sdr
# latest from master as of 2020-09-04 # latest from master as of 2020-09-04
git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b
sed -i 's/-march=native/-march='${MARCH}'/g' configure.ac
./bootstrap.sh ./bootstrap.sh
./configure ./configure
make make