diff --git a/docker-builder-data/build/script/common/helpers.sh b/docker-builder-data/build/script/common/helpers.sh index 855d0c4..2665a20 100644 --- a/docker-builder-data/build/script/common/helpers.sh +++ b/docker-builder-data/build/script/common/helpers.sh @@ -167,6 +167,15 @@ copy_system_lib() { fi } +copy_system_gcc_libs() { + local DST_PATH=$1 + copy_system_lib libgcc "$DST_PATH" || return 1 + copy_system_lib libquadmath "$DST_PATH" || return 1 + copy_system_lib libgfortran "$DST_PATH" || return 1 + copy_system_lib libssp "$DST_PATH" || return 1 + copy_system_lib libstdc++ "$DST_PATH" || return 1 +} + add_common_licenses() { local FILE="$1" local TARGET="$2" diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index 2eb1cb0..f7f3ed0 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -103,8 +103,8 @@ pkinstall() { cp "$BUILD_PACKET_DIR/$PK_DIRNAME/toonz/sources/toonz/toonz.ico" "$TARGET" || return 1 else local TARGET="$INSTALL_PACKET_DIR/lib/" - copy_system_lib libudev "$TARGET" || return 1 - copy_system_lib libgfortran "$TARGET" || return 1 + copy_system_gcc_libs "$TARGET" || return 1 + copy_system_lib libudev "$TARGET" || return 1 fi } @@ -118,7 +118,7 @@ pkhook_postlicense() { copy_system_license mingw$ARCH-win-iconv "$TARGET" || return 1 copy_system_license mingw$ARCH-termcap "$TARGET" || return 1 else + copy_system_license gcc "$TARGET" || return 1 copy_system_license libudev "$TARGET" || return 1 - copy_system_license gfortran "$TARGET" || return 1 fi } diff --git a/docker-builder-data/build/script/packet/papagayong-appimage.sh b/docker-builder-data/build/script/packet/papagayong-appimage.sh index 7a53816..c8daebf 100644 --- a/docker-builder-data/build/script/packet/papagayong-appimage.sh +++ b/docker-builder-data/build/script/packet/papagayong-appimage.sh @@ -18,8 +18,8 @@ pkinstall() { cp --remove-destination "$FILES_PACKET_DIR/launch.sh" "$APPDIR/usr/bin/" || return 1 cp --remove-destination "$FILES_PACKET_DIR/papagayong" "$APPDIR/usr/bin/" || return 1 + copy_system_gcc_libs "$APPDIR/usr/lib/" || return 1 copy_system_lib libudev "$APPDIR/usr/lib/" || return 1 - copy_system_lib libgfortran "$APPDIR/usr/lib/" || return 1 copy_system_lib libpng12 "$APPDIR/usr/lib/" || return 1 copy_system_lib libffi "$APPDIR/usr/lib/" || return 1 copy_system_lib libdb "$APPDIR/usr/lib/" || return 1 diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index adb6f71..b737dc3 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -98,8 +98,8 @@ pkinstall() { cp $LOCAL_DIR/libjpeg*.dll "$TARGET" || return 1 else local TARGET="$INSTALL_PACKET_DIR/lib/" + copy_system_gcc_libs "$TARGET" || return 1 copy_system_lib libudev "$TARGET" || return 1 - copy_system_lib libgfortran "$TARGET" || return 1 copy_system_lib libdb "$TARGET" || return 1 copy_system_lib libpcre "$TARGET" || return 1 copy_system_lib libdirect "$TARGET" || return 1 @@ -123,8 +123,8 @@ pkhook_postlicense() { copy_system_license mingw$ARCH-bzip2 "$TARGET" || return 1 copy_system_license mingw$ARCH-freetype "$TARGET" || return 1 else + copy_system_license gcc "$TARGET" || return 1 copy_system_license libudev "$TARGET" || return 1 - copy_system_license gfortran "$TARGET" || return 1 copy_system_license libdb "$TARGET" || return 1 copy_system_license libpcre "$TARGET" || return 1 copy_system_license libdirectfb "$TARGET" || return 1