github/docker-amiga-gcc
1
0
Fork 0
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git synced 2026-09-11 19:36:31 +00:00
Code Issues Releases Wiki Activity

Fix docker image build

Browse Source
This commit is contained in:
Marlon Beijer
2026-08-25 13:04:08 +02:00
parent ba2e2d5b91
commit 761b1871e9
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+5 -4
View File
@@ -1,7 +1,7 @@
ARG BUILD_OS
ARG BUILD_PFX
FROM --platform=$TARGETPLATFORM amigadev/${BUILD_PFX}:latest as build-env
FROM --platform=$TARGETPLATFORM amigadev/${BUILD_PFX}:latest AS build-env
ARG TARGETPLATFORM
FROM amigadev/docker-base:latest
@@ -10,8 +10,8 @@ ARG BUILD_OS
ARG BUILD_PFX
ARG PREFIX
ENV CROSS_PFX $PREFIX
ENV OS_NAME $BUILD_OS
ENV CROSS_PFX=$PREFIX
ENV OS_NAME=$BUILD_OS
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
@@ -29,6 +29,7 @@ ENTRYPOINT ["/entry/entrypoint.sh"]
COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
COPY imagefiles/entrypoint.sh /entry/
COPY imagefiles/patches/ /patches/
ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \
@@ -47,7 +48,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
RUN cmake --version
RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
RUN cp -afv /CMakeModules/. /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ && rm -rf /CMakeModules
RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
dependencies/toolchains
Vendored
+1 -1
Submodule dependencies/toolchains updated: 4f4b0779e3...c579e46732
imagefiles/patches/sdl-old-timerbase-device.patch
+30
View File
@@ -0,0 +1,30 @@
diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c
--- a/src/timer/amigaos/SDL_systimer.c
+++ b/src/timer/amigaos/SDL_systimer.c
@@ -71,7 +71,7 @@
extern struct ExecBase *SysBase;
static struct timeval basetime;
-struct Library *TimerBase;
+struct Device *TimerBase;
struct Task *OwnerTask;
struct timerequest *TimerReq[2]; /* Local copy! */
@@ -163,7 +163,7 @@ gettimerbase() {
/* Open with UNIT_VBLANK, but any unit can be used */
if ( !(error = OpenDevice(TIMERNAME, UNIT_MICROHZ, (struct IORequest *)TimerIO_2, 0L))) {
/* Issue the command and wait for it to finish, then get the reply */
- TimerBase = (struct Library *)TimerIO_2->tr_node.io_Device;
+ TimerBase = TimerIO_2->tr_node.io_Device;
TimerReq[0] = TimerIO_2;
TimerReq[1] = TimerIO_2;
@@ -234,7 +234,7 @@ void SDL_Delay(Uint32 ms) {
/* Data to handle a single periodic alarm */
static int timer_alive = 0;
static SDL_Thread *timer_thread = NULL;
-struct Library *TimerBase;
+struct Device *TimerBase;
int RunTimer(void *unused) {
struct timeval tv;
platforms/m68k-amigaos-gcc10/prep.sh
+3
View File
@@ -29,6 +29,9 @@ fi
cd "${SUBMODULES}"/SDL
git checkout SDL-1.2-AmigaOS3
git pull
if ! git apply --reverse --check /patches/sdl-old-timerbase-device.patch 2>/dev/null; then
git apply /patches/sdl-old-timerbase-device.patch
fi
rm -rf "${SUBMODULES}"/SDL/build
mkdir -p "${SUBMODULES}"/SDL/build
cd "${SUBMODULES}"/SDL/build
platforms/m68k-amigaos/prep.sh
+3
View File
@@ -29,6 +29,9 @@ fi
cd "${SUBMODULES}"/SDL
git checkout SDL-1.2-AmigaOS3
git pull
if ! git apply --reverse --check /patches/sdl-old-timerbase-device.patch 2>/dev/null; then
git apply /patches/sdl-old-timerbase-device.patch
fi
rm -rf "${SUBMODULES}"/SDL/build
mkdir -p "${SUBMODULES}"/SDL/build
cd "${SUBMODULES}"/SDL/build