80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

CI: Use libslirp proper for Linux builds

Browse Source
This commit is contained in:
David Hrdlička
2022-02-09 16:22:21 +01:00
parent 1654c8ec8f
commit fee2fe6e06
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/build.sh
View File

@@ -229,7 +229,7 @@ else
# ...and the ones we do want listed. Non-dev packages fill missing spots on the list. # ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
libpkgs="" libpkgs=""
longest_libpkg=0 longest_libpkg=0
for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libglib2.0-dev for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libglib2.0-dev libslirp-dev
do do
libpkgs="$libpkgs $pkg:$arch_deb" libpkgs="$libpkgs $pkg:$arch_deb"
length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c) length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)
@@ -280,6 +280,9 @@ EOF
sudo apt-get update sudo apt-get update
DEBIAN_FRONTEND=noninteractive sudo apt-get -y install $pkgs $libpkgs DEBIAN_FRONTEND=noninteractive sudo apt-get -y install $pkgs $libpkgs
sudo apt-get clean sudo apt-get clean
# Link against the system libslirp instead of compiling ours.
cmake_flags_extra="$cmake_flags_extra -D SLIRP_EXTERNAL=ON"
fi fi
# Clean workspace. # Clean workspace.