wip: config cache is too unreliable

This commit is contained in:
Marcus Holland-Moritz 2025-07-26 13:46:24 +02:00
parent 483647a5fc
commit a24fcef7be
2 changed files with 7 additions and 19 deletions

View File

@ -85,15 +85,10 @@ RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgc
RUN apk del zlib-dev zstd-dev RUN apk del zlib-dev zstd-dev
# Clear the config cache after a toolchain update
RUN --mount=type=cache,id=cfgcache,target=/root/.cfgcache \
rm -rf /root/.cfgcache/*
# Install all static libraries # Install all static libraries
COPY install-static-libs.sh /usr/local/bin/install-static-libs.sh COPY install-static-libs.sh /usr/local/bin/install-static-libs.sh
RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \ RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
--mount=type=cache,id=cfgcache,target=/root/.cfgcache \
bash /usr/local/bin/install-static-libs.sh :all $TARGET_ARCHS bash /usr/local/bin/install-static-libs.sh :all $TARGET_ARCHS
# Install UPX # Install UPX

View File

@ -339,8 +339,7 @@ EOF
fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/libunwind/Remove-the-useless-endina.h-for-loongarch64.patch - | patch -p1 fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/libunwind/Remove-the-useless-endina.h-for-loongarch64.patch - | patch -p1
fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/libunwind/fix-libunwind-pc-in.patch - | patch -p1 fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/libunwind/fix-libunwind-pc-in.patch - | patch -p1
LDFLAGS="$LDFLAGS -lucontext" CFLAGS="$CFLAGS -fno-stack-protector" \ LDFLAGS="$LDFLAGS -lucontext" CFLAGS="$CFLAGS -fno-stack-protector" \
./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --enable-cxx-exceptions --disable-tests --disable-shared \ ./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --enable-cxx-exceptions --disable-tests --disable-shared
--cache-file=$HOME/.cfgcache/libunwind-${LIBUNWIND_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
fi fi
@ -401,16 +400,14 @@ EOF
mkdir build-minimal mkdir build-minimal
cd build-minimal cd build-minimal
../configure ${TRIPLETS} --prefix="$INSTALL_DIR-jemalloc-minimal" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \ ../configure ${TRIPLETS} --prefix="$INSTALL_DIR-jemalloc-minimal" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \
--disable-stats --disable-prof --enable-static --disable-shared --disable-log --disable-debug \ --disable-stats --disable-prof --enable-static --disable-shared --disable-log --disable-debug
--cache-file=$HOME/.cfgcache/jemalloc-minimal-${JEMALLOC_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
cd .. cd ..
mkdir build-full mkdir build-full
cd build-full cd build-full
../configure ${TRIPLETS} --prefix="$INSTALL_DIR-jemalloc-full" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \ ../configure ${TRIPLETS} --prefix="$INSTALL_DIR-jemalloc-full" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \
--enable-stats --enable-prof --enable-static --disable-shared --disable-log --disable-debug \ --enable-stats --enable-prof --enable-static --disable-shared --disable-log --disable-debug
--cache-file=$HOME/.cfgcache/jemalloc-${JEMALLOC_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
fi fi
@ -458,8 +455,7 @@ EOF
cd fuse-${LIBFUSE_VERSION} cd fuse-${LIBFUSE_VERSION}
./configure ${TRIPLETS} --prefix="$INSTALL_DIR" \ ./configure ${TRIPLETS} --prefix="$INSTALL_DIR" \
--disable-shared --enable-static \ --disable-shared --enable-static \
--disable-example --enable-lib --disable-util \ --disable-example --enable-lib --disable-util
--cache-file=$HOME/.cfgcache/fuse-${LIBFUSE_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
fi fi
@ -553,8 +549,7 @@ EOF
./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --localstatedir=/var --sysconfdir=/etc \ ./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --localstatedir=/var --sysconfdir=/etc \
--disable-rpath --disable-werror --disable-doc --disable-shared --disable-nls \ --disable-rpath --disable-werror --disable-doc --disable-shared --disable-nls \
--disable-xz --disable-xzdec --disable-lzmainfo --disable-lzmadec \ --disable-xz --disable-xzdec --disable-lzmainfo --disable-lzmadec \
--disable-lzma-links --disable-scripts \ --disable-lzma-links --disable-scripts
--cache-file=$HOME/.cfgcache/xz-${XZ_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
fi fi
@ -656,8 +651,7 @@ EOF
--without-bz2lib --without-zlib \ --without-bz2lib --without-zlib \
--disable-shared --disable-acl --disable-xattr \ --disable-shared --disable-acl --disable-xattr \
--disable-bsdtar --disable-bsdcat --disable-bsdcpio \ --disable-bsdtar --disable-bsdcat --disable-bsdcpio \
--disable-bsdunzip \ --disable-bsdunzip
--cache-file=$HOME/.cfgcache/libarchive-${LIBARCHIVE_VERSION}-${CARCH}-${COMPILER}${sslsuffix}.cache
make -j$(nproc) make -j$(nproc)
make install make install
done done
@ -679,8 +673,7 @@ EOF
tar xf ${WORKROOT}/${FLAC_TARBALL} tar xf ${WORKROOT}/${FLAC_TARBALL}
cd flac-${FLAC_VERSION} cd flac-${FLAC_VERSION}
./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --enable-static=yes --enable-shared=no \ ./configure ${TRIPLETS} --prefix="$INSTALL_DIR" --enable-static=yes --enable-shared=no \
--disable-doxygen-docs --disable-ogg --disable-programs --disable-examples \ --disable-doxygen-docs --disable-ogg --disable-programs --disable-examples
--cache-file=$HOME/.cfgcache/flac-${FLAC_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)
make install make install
fi fi