[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-659-g721f56e

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  721f56eae47a423a75c39aebcf28f1bef6bed780 (commit)
       via  8566edef091e03349d44c58309b71f5526615a82 (commit)
       via  f8d83af09189417d7c4163cd362254c7b9988ef2 (commit)
       via  4084632ddf32b1fc0b9003417aec746ba31ab2f8 (commit)
      from  0aa7b383a840ac85b2bb2840675a8902a24ecd30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 721f56eae47a423a75c39aebcf28f1bef6bed780
Merge: 8566ede f8d83af
Author: Lawrence Sebald <ljs...@us...>
Date:   Mon Feb 27 19:20:29 2023 -0500

    Merge pull request #114 from Dreamcast-Projects/master
    
    Fix out of memory example compiling for gcc 4.7.4

commit 8566edef091e03349d44c58309b71f5526615a82
Author: Tchan0 <617...@us...>
Date:   Tue Feb 28 01:19:33 2023 +0100

    Fix Dockerfile for lack of --check option in sha512sum
    
    See GitHub PR #115.

commit f8d83af09189417d7c4163cd362254c7b9988ef2
Author: Andress Barajas <and...@gm...>
Date:   Mon Feb 27 08:51:52 2023 -0800

    Fix out of memory example compiling for gcc 4.7.4

commit 4084632ddf32b1fc0b9003417aec746ba31ab2f8
Author: Tchan0 <617...@us...>
Date:   Sun Feb 26 22:20:20 2023 +0100

    Fix dc-chain Dockerfiles
    
    * Update Dockerfile
    
    - Alpine:latest requires a version nr for python
    - added missing endline continues
    
    * Update Dockerfile
    
    - Alpine:latest requires a version nr for python
    - added missing endline continues

-----------------------------------------------------------------------

Summary of changes:
 examples/dreamcast/cpp/out_of_memory/Makefile | 2 +-
 utils/dc-chain/docker/stable/Dockerfile       | 7 ++++---
 utils/dc-chain/docker/testing/Dockerfile      | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/dreamcast/cpp/out_of_memory/Makefile b/examples/dreamcast/cpp/out_of_memory/Makefile
index 0d05a2b..f3e5987 100644
--- a/examples/dreamcast/cpp/out_of_memory/Makefile
+++ b/examples/dreamcast/cpp/out_of_memory/Makefile
@@ -5,7 +5,7 @@
 
 TARGET = out_of_memory.elf
 OBJS = out_of_memory.o
-KOS_CPPFLAGS += -fexceptions
+KOS_CPPFLAGS += -fexceptions -std=c++11
 
 all: rm-elf $(TARGET)
 
diff --git a/utils/dc-chain/docker/stable/Dockerfile b/utils/dc-chain/docker/stable/Dockerfile
index 87ccdb1..ab5be1e 100644
--- a/utils/dc-chain/docker/stable/Dockerfile
+++ b/utils/dc-chain/docker/stable/Dockerfile
@@ -18,7 +18,7 @@ RUN apk --update add --no-cache \
 	curl \
 	wget \
 	git \
-	python \
+	python3 \
 	subversion \
 	&& apk --update add --no-cache libelf-dev --repository=http://dl-cdn.alpinelinux.org/alpine/v3.9/main \
 	&& rm -rf /var/cache/apk/*
@@ -27,8 +27,9 @@ RUN apk --update add --no-cache \
 # You may adapt the KallistiOS repository URL if needed
 RUN mkdir -p /opt/toolchains/dc \
 	&& git clone https://git.code.sf.net/p/cadcdev/kallistios /opt/toolchains/dc/kos \
-	&& cd /opt/toolchains/dc/kos/utils/dc-chain
-	&& cp config.mk.stable.sample config.mk
+	&& cd /opt/toolchains/dc/kos/utils/dc-chain \
+	&& cp config.mk.stable.sample config.mk \
+	&& sed -i -e 's/#use_custom_dependencies=1/use_custom_dependencies=1/g' config.mk \
 	&& ./download.sh && ./unpack.sh && make && make gdb \
 	&& rm -rf /opt/toolchains/dc/kos
 
diff --git a/utils/dc-chain/docker/testing/Dockerfile b/utils/dc-chain/docker/testing/Dockerfile
index a6469b7..50b86c0 100644
--- a/utils/dc-chain/docker/testing/Dockerfile
+++ b/utils/dc-chain/docker/testing/Dockerfile
@@ -18,7 +18,7 @@ RUN apk --update add --no-cache \
 	curl \
 	wget \
 	git \
-	python \
+	python3 \
 	subversion \
 	&& apk --update add --no-cache libelf-dev --repository=http://dl-cdn.alpinelinux.org/alpine/v3.9/main \
 	&& rm -rf /var/cache/apk/*
@@ -27,8 +27,9 @@ RUN apk --update add --no-cache \
 # You may adapt the KallistiOS repository URL if needed
 RUN mkdir -p /opt/toolchains/dc \
 	&& git clone https://git.code.sf.net/p/cadcdev/kallistios /opt/toolchains/dc/kos \
-	&& cd /opt/toolchains/dc/kos/utils/dc-chain
-	&& cp config.mk.testing.sample config.mk
+	&& cd /opt/toolchains/dc/kos/utils/dc-chain \
+	&& cp config.mk.testing.sample config.mk \
+	&& sed -i -e 's/#use_custom_dependencies=1/use_custom_dependencies=1/g' config.mk \
 	&& ./download.sh && ./unpack.sh && make && make gdb \
 	&& rm -rf /opt/toolchains/dc/kos
 


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.