diff --git a/appimage.sh b/appimage.sh index 82dbac7f..f9663e9a 100755 --- a/appimage.sh +++ b/appimage.sh @@ -73,6 +73,25 @@ for lib in ${soapy_module_libs[@]}; do linuxdeploy_lib_args+=( "-l" "$lib" ) done +# force otherwise excluded libraries that we really need because of library +# dependence on newer versions +linuxdeploy_lib_args+=( + "-l" "$PREFIX"/lib/libasound.so.2 + "-l" "$PREFIX"/lib/libexpat.so.1 + "-l" "$PREFIX"/lib/libfontconfig.so.1 + "-l" "$PREFIX"/lib/libfreetype.so.6 + "-l" "$PREFIX"/lib/libgcc_s.so.1 + "-l" "$PREFIX"/lib/libgmp.so.10 + "-l" "$PREFIX"/lib/libgpg-error.so.0 + "-l" "$PREFIX"/lib/libharfbuzz.so.0 + "-l" "$PREFIX"/lib/libjack.so.0 + "-l" "$PREFIX"/lib/libstdc++.so.6 + "-l" "$PREFIX"/lib/libusb-1.0.so.0 + "-l" "$PREFIX"/lib/libuuid.so.1 + "-l" "$PREFIX"/lib/libxcb.so.1 + "-l" "$PREFIX"/lib/libz.so.1 +) + mkdir -p ./AppDir/apprun-hooks echo 'export CONDA_PREFIX="$APPDIR/usr"' >./AppDir/apprun-hooks/soapy-hook.sh echo 'export UHD_PKG_PATH="$APPDIR/usr"' >./AppDir/apprun-hooks/uhd-hook.sh @@ -91,21 +110,6 @@ RESULT=$? # copy Soapy modules into their expected path in the AppDir cp -R "$PREFIX"/lib/SoapySDR ./AppDir/usr/lib/SoapySDR -# copy blacklisted libraries that we really need because of library dependence -# on newer versions -cp "$PREFIX"/lib/libexpat.so.1 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libfontconfig.so.1 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libfreetype.so.6 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libgcc_s.so.1 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libgmp.so.10 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libgpg-error.so.0 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libharfbuzz.so.0 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libstdc++.so.6 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libusb-1.0.so.0 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libuuid.so.1 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libxcb.so.1 ./AppDir/usr/lib/ -cp "$PREFIX"/lib/libz.so.1 ./AppDir/usr/lib/ - # copy fontconfig configuration files that the FONTCONFIG_FILE env var points to mkdir -p ./AppDir/etc/ cp -RL "$PREFIX"/etc/fonts ./AppDir/etc/fonts