From a2abcc9bb3a69c87373cee88f91f26bbaedf6068 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 13 May 2024 00:23:34 +1000 Subject: [PATCH] CI/AppImage: Don't bundle libssl/libcrypto --- scripts/appimage/make-appimage.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/appimage/make-appimage.sh b/scripts/appimage/make-appimage.sh index 309878529..ddbd0fc97 100755 --- a/scripts/appimage/make-appimage.sh +++ b/scripts/appimage/make-appimage.sh @@ -55,6 +55,11 @@ BINARY=duckstation-qt APPDIRNAME=DuckStation.AppDir STRIP=strip +declare -a EXCLUDE_LIBS=( + 'libcrypto.so*' + 'libssl.so*' +) + declare -a MANUAL_LIBS=( "libshaderc_shared.so" ) @@ -95,7 +100,7 @@ OUTDIR=$(realpath "./$APPDIRNAME") rm -fr "$OUTDIR" echo "Locating extra libraries..." -EXTRA_LIBS_ARGS="" +declare -a EXTRA_LIBS_ARGS=() for lib in "${MANUAL_LIBS[@]}"; do srcpath=$(find "$DEPSDIR" -name "$lib") if [ ! -f "$srcpath" ]; then @@ -105,11 +110,12 @@ for lib in "${MANUAL_LIBS[@]}"; do echo "Found $lib at $srcpath." - if [ "$EXTRA_LIBS_ARGS" == "" ]; then - EXTRA_LIBS_ARGS="--library=$srcpath" - else - EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath" - fi + EXTRA_LIBS_ARGS+=("--library=$srcpath") +done + +declare -a EXCLUDE_LIBS_ARGS=() +for lib in "${EXCLUDE_LIBS[@]}"; do + EXCLUDE_LIBS_ARGS+=("--exclude-library=$lib") done # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off. @@ -134,7 +140,8 @@ EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \ DEPLOY_PLATFORM_THEMES="1" \ QMAKE="$DEPSDIR/bin/qmake" \ NO_STRIP="1" \ -$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" $EXTRA_LIBS_ARGS \ +$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" \ +"${EXTRA_LIBS_ARGS[@]}" "${EXCLUDE_LIBS_ARGS[@]}" \ --desktop-file="$ROOTDIR/scripts/org.duckstation.DuckStation.desktop" \ --icon-file="$ROOTDIR/scripts/org.duckstation.DuckStation.png" \