github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-06 03:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Don't use zlib-ng on cross-compiled AppImages

Browse Source 
Seems to be problematic on armhf, and I can't be arsed debugging it.
This commit is contained in:
Stenzek 2025-03-23 23:40:58 +10:00
parent 104c82c2c3
commit 3f0abccb59
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/deps/build-dependencies-linux-cross.sh
View File

@ -274,16 +274,17 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
EOF EOF
# Build zlib first because of the things that depend on it. # Build zlib first because of the things that depend on it.
if [ "$SKIP_ZLIBNG" != true ]; then # Disabled because it currently causes crashes on armhf.
echo "Building zlib-ng..." #if [ "$SKIP_ZLIBNG" != true ]; then
rm -fr "zlib-ng-$ZLIBNG" # echo "Building zlib-ng..."
tar xf "zlib-ng-$ZLIBNG.tar.gz" # rm -fr "zlib-ng-$ZLIBNG"
cd "zlib-ng-$ZLIBNG" # tar xf "zlib-ng-$ZLIBNG.tar.gz"
cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja # cd "zlib-ng-$ZLIBNG"
cmake --build build --parallel # cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja
ninja -C build install # cmake --build build --parallel
cd .. # ninja -C build install
fi # cd ..
#fi
# NOTE: Must be a shared library because otherwise aarch64 libgcc symbols are missing when building with clang. # NOTE: Must be a shared library because otherwise aarch64 libgcc symbols are missing when building with clang.
echo "Building libbacktrace..." echo "Building libbacktrace..."

1
scripts/packaging/appimage/make-cross-appimage.sh
View File

@ -107,7 +107,6 @@ declare -a DEPLIBS=(
"libwebpdemux.so.2" "libwebpdemux.so.2"
"libwebpmux.so.3" "libwebpmux.so.3"
"libwebp.so.7" "libwebp.so.7"
"libz.so.1"
"libzip.so.5" "libzip.so.5"
"libzstd.so.1" "libzstd.so.1"