mirror of
https://github.com/scummvm/dockerized-bb.git
synced 2026-06-20 05:46:00 +00:00
AMIGAOS: Upgrade toolchain
Newer SDK fails to extract with lhasa, use an alternative which works.
This commit is contained in:
1 parent
bac3199f7a
commit
959ea43bd5
5 files changed
+44
-22
No files matched your search
@@ -13,7 +13,6 @@ RUN apt-get update && \
|
||||
flex \
|
||||
gcc \
|
||||
g++ \
|
||||
lhasa \
|
||||
libgmp-dev \
|
||||
libmpc-dev \
|
||||
libmpfr-dev \
|
||||
@@ -24,6 +23,9 @@ RUN apt-get update && \
|
||||
ENV CROSS_PREFIX=/usr/local/amigaos4 HOST=ppc-amigaos
|
||||
ENV PREFIX=$CROSS_PREFIX/$HOST
|
||||
|
||||
# Build a correct LHA extractor: https://forum.hyperion-entertainment.com/viewtopic.php?t=4767
|
||||
local_package(lha)
|
||||
|
||||
local_package(toolchain)
|
||||
|
||||
# Build regina-rexx interpreter as Debian removed it
|
||||
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#! /bin/sh
|
||||
|
||||
LHA_VERSION=167f6eabcbae425922e0fee3388c10f4073a0117
|
||||
|
||||
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
HELPERS_DIR=$PACKAGE_DIR/../..
|
||||
. $HELPERS_DIR/functions.sh
|
||||
|
||||
do_make_bdir
|
||||
|
||||
do_http_fetch lha "https://github.com/jca02266/lha/archive/${LHA_VERSION}.tar.gz" 'tar xzf'
|
||||
|
||||
autoreconf -vfi
|
||||
|
||||
# We don't use do_configure as it's a native build
|
||||
./configure --prefix="${CROSS_PREFIX}"
|
||||
|
||||
do_make
|
||||
do_make install
|
||||
|
||||
do_clean_bdir
|
||||
|
||||
# Cleanup wget HSTS
|
||||
rm -f $HOME/.wget-hsts
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
TOOLCHAIN_VERSION=58d6f763596974b8ba6d20953e6ef7a30a27d45f
|
||||
TOOLCHAIN_VERSION=5ec2e2d879f2cc0cb4fe2b63a1a0594a54be7bea
|
||||
|
||||
# Versions of components to use provided by toolchain
|
||||
BINUTILS_VER=2.23.2
|
||||
@@ -25,6 +25,9 @@ HOME="$(pwd)" git config --global user.name "Gild patch"
|
||||
HOME="$(pwd)" gild/bin/gild checkout binutils "${BINUTILS_VER}"
|
||||
HOME="$(pwd)" gild/bin/gild checkout gcc "${GCC_VER}"
|
||||
|
||||
# We need lha which is already installed in CROSS_PREFIX
|
||||
export PATH="${CROSS_PREFIX}/bin:${PATH}"
|
||||
|
||||
do_make -C native-build gcc-cross
|
||||
|
||||
do_make -C native-build additionals-libs
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
commit dc599576c9238edcfb92fe3efe023205c3e49544
|
||||
Author: Le Philousophe <lephilousophe@users.noreply.github.com>
|
||||
Date: Tue May 11 18:53:22 2021 +0200
|
||||
From 76605b69039bfc627cf8c02dac19f1fc7a23f20f Mon Sep 17 00:00:00 2001
|
||||
From: Le Philousophe <lephilousophe@users.noreply.github.com>
|
||||
Date: Sun, 30 Oct 2022 17:26:18 +0100
|
||||
Subject: [PATCH] Fix additional libs for SDK 54.16
|
||||
|
||||
Fix additional libs for SDK 53.30
|
||||
---
|
||||
native-build/makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/native-build/makefile b/native-build/makefile
|
||||
index 7cab4f4..05b2c4f 100644
|
||||
index e7e448e..e28a1c7 100644
|
||||
--- a/native-build/makefile
|
||||
+++ b/native-build/makefile
|
||||
@@ -205,7 +205,7 @@ additionals-libs:
|
||||
@@ -206,7 +206,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
|
||||
+ cd /tmp/abcd/SDK_Install && lha x pthreads-53.12.lha
|
||||
cp -Rf /tmp/abcd/SDK_Install/Local/* $(CROSS_PREFIX)/ppc-amigaos/SDK/local
|
||||
rm -Rf /tmp/abcd
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/native-build/makefile b/native-build/makefile
|
||||
index 26d508a..2b540dd 100644
|
||||
--- a/native-build/makefile
|
||||
+++ b/native-build/makefile
|
||||
@@ -36,7 +36,7 @@ endif
|
||||
|
||||
GCC_BRANCH_NAME:=$(word 1, $(subst ., , $(GCC_VERSION)))
|
||||
|
||||
-SDK_URL=http://www.hyperion-entertainment.biz/index.php?option=com_registration&view=download&format=raw&file=69&Itemid=82
|
||||
+SDK_URL=http://www.hyperion-entertainment.biz/index.php?option=com_registration&view=download&format=raw&file=82&Itemid=82
|
||||
SDK_VERSION=53.30
|
||||
|
||||
# Native tools
|
||||
Reference in new issue
Block a user