diff --git a/toolchains/amigaos4/Dockerfile.m4 b/toolchains/amigaos4/Dockerfile.m4 index fcdebfe..c561dca 100644 --- a/toolchains/amigaos4/Dockerfile.m4 +++ b/toolchains/amigaos4/Dockerfile.m4 @@ -75,7 +75,6 @@ local_package(codesets) local_package(libopenssl) # Needed by precompiled libcurl -local_package(pthreads) local_package(librtmp) local_package(libcurl) diff --git a/toolchains/amigaos4/packages/pthreads/build.sh b/toolchains/amigaos4/packages/pthreads/build.sh deleted file mode 100755 index 817f812..0000000 --- a/toolchains/amigaos4/packages/pthreads/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) -HELPERS_DIR=$PACKAGE_DIR/../.. -. $HELPERS_DIR/functions.sh - -do_make_bdir - -do_lha_fetch misc/pthreads "SDK" - -do_lha_install - -do_clean_bdir diff --git a/toolchains/amigaos4/packages/toolchain/build.sh b/toolchains/amigaos4/packages/toolchain/build.sh index 0726d4e..16c804c 100755 --- a/toolchains/amigaos4/packages/toolchain/build.sh +++ b/toolchains/amigaos4/packages/toolchain/build.sh @@ -27,6 +27,8 @@ HOME="$(pwd)" gild/bin/gild checkout gcc "${GCC_VER}" do_make -C native-build gcc-cross +do_make -C native-build additionals-libs + # Fix missing rights for library files chmod -R go+rX "${CROSS_PREFIX}" diff --git a/toolchains/amigaos4/packages/toolchain/patches/fix-additional-libs.patch b/toolchains/amigaos4/packages/toolchain/patches/fix-additional-libs.patch new file mode 100644 index 0000000..4e9b13c --- /dev/null +++ b/toolchains/amigaos4/packages/toolchain/patches/fix-additional-libs.patch @@ -0,0 +1,19 @@ +commit dc599576c9238edcfb92fe3efe023205c3e49544 +Author: Le Philousophe +Date: Tue May 11 18:53:22 2021 +0200 + + Fix additional libs for SDK 53.30 + +diff --git a/native-build/makefile b/native-build/makefile +index 7cab4f4..05b2c4f 100644 +--- a/native-build/makefile ++++ b/native-build/makefile +@@ -205,7 +205,7 @@ additionals-libs: + mkdir -p $(CROSS_PREFIX)/ppc-amigaos/SDK/local/common/include + mkdir -p /tmp/abcd + cd downloads && lha xw=/tmp/abcd SDK_$(SDK_VERSION).lha +- cd /tmp/abcd/SDK_Install && lha x pthread.lha && lha x zlib-1.2.3.lha ++ cd /tmp/abcd/SDK_Install && lha x pthreads-53.11.lha + cp -Rf /tmp/abcd/SDK_Install/Local/* $(CROSS_PREFIX)/ppc-amigaos/SDK/local + rm -Rf /tmp/abcd +