From 4c965daafd3cf37baa9c14a5d8d11a2c6d7c6199 Mon Sep 17 00:00:00 2001 From: Eric Willigers Date: Fri, 22 May 2026 08:20:51 +1000 Subject: [PATCH 1/2] use gcc 15.2.0-r11 --- .github/workflows/ci.yml | 2 +- Dockerfile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c482d..ec79dca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: install: true - name: Build Docker image and store in cache - uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f + uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . push: false diff --git a/Dockerfile b/Dockerfile index b3ddf5e..83f5a2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,12 @@ FROM ${WOLFI_BASE} AS builder # build-base bundles gcc/g++, make and glibc-dev (for the C++ side # of Factor's VM); the rest fetch + bootstrap the source tree. -RUN apk add --no-cache bash build-base curl git wget +# gcc / libstdc++-dev are held at the last 15.x release: Wolfi's gcc 16 +# package omits the libgcc_s_asneeded linker script that GCC's driver still +# passes as -lgcc_s_asneeded, and a gcc-15 / libstdc++-16 mix can't find +# because the headers live under /usr/include/c++/16. +RUN apk add --no-cache bash build-base curl git wget \ + gcc=15.2.0-r11 libstdc++-dev=15.2.0-r11 # Factor 0.101 ARG FACTOR_COMMIT="a56e6390e81340be6573cb790311c0a980a5f369" From aeed4703a791302c3e11af1785d5656b0b355180 Mon Sep 17 00:00:00 2001 From: Eric Willigers Date: Fri, 22 May 2026 08:25:17 +1000 Subject: [PATCH 2/2] + --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83f5a2e..1bbd9bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,7 @@ FROM ${WOLFI_BASE} AS builder # build-base bundles gcc/g++, make and glibc-dev (for the C++ side # of Factor's VM); the rest fetch + bootstrap the source tree. -# gcc / libstdc++-dev are held at the last 15.x release: Wolfi's gcc 16 -# package omits the libgcc_s_asneeded linker script that GCC's driver still -# passes as -lgcc_s_asneeded, and a gcc-15 / libstdc++-16 mix can't find -# because the headers live under /usr/include/c++/16. +# gcc / libstdc++-dev are held at the last 15.x release RUN apk add --no-cache bash build-base curl git wget \ gcc=15.2.0-r11 libstdc++-dev=15.2.0-r11