diff options
| -rw-r--r-- | Containerfile | 2 | ||||
| -rw-r--r-- | Makefile | 20 | ||||
| -rwxr-xr-x | scripts/0150-build-static-deps.sh | 5 |
3 files changed, 15 insertions, 12 deletions
diff --git a/Containerfile b/Containerfile index 37fb7a3..07ada9f 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest AS builder +FROM ubuntu:questing AS builder ARG BINUTILS_VERSION ARG GCC_VERSION @@ -6,12 +6,12 @@ GDB_VERSION ?= 17.1 NEWLIB_VERSION ?= 4.6.0.20260123 ZLIB_VERSION ?= 1.3.2 -NCURSES_VERSION ?= 6.4 -EXPAT_VERSION ?= 2.6.2 -READLINE_VERSION ?= 8.2 -GMP_VERSION ?= 6.2.1 -MPFR_VERSION ?= 4.1.0 -MPC_VERSION ?= 1.2.1 +NCURSES_VERSION ?= 6.6 +EXPAT_VERSION ?= 2.7.5 +READLINE_VERSION ?= 8.3 +GMP_VERSION ?= 6.3.0 +MPFR_VERSION ?= 4.2.2 +MPC_VERSION ?= 1.3.1 TARGET ?= x86_64-pc-elf PLATFORM ?= x86-64 @@ -20,14 +20,14 @@ IMAGE_BUILD ?= 3 IMAGE_NAME = "registry.gitlab.ost.ch:45023/teachos/devcontainers" IMAGE_TAG = "$(PLATFORM):$(GCC_VERSION)-$(IMAGE_BUILD)" -ARCHIVE_NAME = "teachos-$(PLATFORM)-$(GCC_VERSION)-$(IMAGE_BUILD)" +ARCHIVE_NAME = "teachos-$(PLATFORM)-$(GCC_VERSION)-$(IMAGE_BUILD).tar.xz" all: toolchain_archive toolchain_archive: container_image - podman create --name teachos-toolchain-archive $(IMAGE_NAME)/$(IMAGE_TAG) - podman cp teachos-toolchain-archive:/opt/toolchain $(ARCHIVE_NAME) - tar caf $(ARCHIVE_NAME).tar.xz $(ARCHIVE_NAME) + podman run --name teachos-toolchain-archive $(IMAGE_NAME)/$(IMAGE_TAG) tar -C /opt/toolchain -c -a -f /$(ARCHIVE_NAME) . + podman cp teachos-toolchain-archive:/$(ARCHIVE_NAME) $(ARCHIVE_NAME) + podman rm teachos-toolchain-archive container_image: podman pull docker.io/ubuntu:questing diff --git a/scripts/0150-build-static-deps.sh b/scripts/0150-build-static-deps.sh index d0a460f..cc68ecb 100755 --- a/scripts/0150-build-static-deps.sh +++ b/scripts/0150-build-static-deps.sh @@ -36,7 +36,10 @@ cd .. echo "Building static gmp..." tar xf /downloads/gmp-$GMP_VERSION.tar.xz cd gmp-$GMP_VERSION -./configure --prefix=$STATIC_DEPS_PREFIX --disable-shared --enable-static +## PATCH BEGIN +sed -i 's/void g(){}/void g(int,t1 const*,t1,t2,t1 const*,int){}/' configure +## PATCH END +./configure --prefix=$STATIC_DEPS_PREFIX --disable-shared --enable-static || cat config.log make -j$(nproc) && make install cd .. |