TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 13:04:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip: more cleanups

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-07-25 13:29:28 +02:00
parent ff97d2bac1
commit f144da5c5f
5 changed files with 88 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
.docker/Dockerfile.alpine
View File

@ -1,9 +1,18 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG ARCH=amd64 ARG ARCH=amd64
FROM $ARCH/alpine:latest FROM $ARCH/alpine:latest
ARG ARCH
ARG TARGET_ARCHS
ARG TOOLCHAIN_OPTIMIZE=s
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade
RUN apk add --no-cache \ RUN qemu_pkgs=""; \
for arch in $(echo $TARGET_ARCHS | tr ',' ' '); do \
qemu_pkgs="$qemu_pkgs qemu-$arch"; \
done; \
apk add --no-cache \
bash-completion \ bash-completion \
build-base \ build-base \
wget \ wget \
@ -11,81 +20,88 @@ RUN apk add --no-cache \
vim \ vim \
tar \ tar \
ripgrep \ ripgrep \
py3-pip \
less \ less \
gcc \ gcc \
g++ \ g++ \
clang18 \ clang18 \
clang19 \ clang19 \
clang20 \
git \ git \
xz \
gzip \
bzip2 \
zstd \
ccache \ ccache \
samurai \ ninja-build \
cmake \ cmake \
make \ make \
bison \ bison \
flex \ flex \
ronn \ ronn \
fuse \ fuse \
fuse-dev \
fuse-static \
fuse3 \ fuse3 \
fuse3-dev \
fuse3-static \
pkgconf \ pkgconf \
binutils-dev \
libevent-dev \
libevent-static \
linux-headers \
date-dev \
range-v3-dev \
zlib-static \
libucontext-dev \
libdwarf-dev \
elfutils-dev \
utfcpp \
nlohmann-json \
meson \ meson \
autoconf \ autoconf \
strace \ strace \
gdb gdb \
gmp-dev \
zlib-static \
zstd-static \
zlib-dev \
zstd-dev \
mpfr-dev \
mpc1-dev \
isl-dev \
texinfo \
linux-headers \
rsync \
$qemu_pkgs
# Install UPX COPY fetch.sh /usr/local/bin/fetch.sh
ARG ARCH
# UPX isn't supported on RISC-V yet, so skip this
RUN if [ "$ARCH" != "riscv64" ]; then \
wget -O - https://github.com/upx/upx/releases/download/v5.0.0/upx-5.0.0-$(bash -c "echo \${0//v8/}" $ARCH)_linux.tar.xz | tar -xJf - -C /usr/local/bin --strip-components=1 --wildcards "*/upx"; \
else \
echo "Skipping UPX installation for RISC-V architecture while it is not supported."; \
echo "See https://github.com/upx/upx/discussions/793 for details."; \
fi
# Install mistletoe
RUN pip3 install --break-system-packages --root-user-action ignore mistletoe
# Install size-optimized and static-link-optimized libstdc++
RUN apk add --no-cache gmp-dev mpfr-dev mpc1-dev isl-dev
COPY install-libstdcxx.sh /usr/local/bin/install-libstdcxx.sh
RUN bash /usr/local/bin/install-libstdcxx.sh
# Install mold # Install mold
COPY install-mold.sh /usr/local/bin/install-mold.sh COPY install-mold.sh /usr/local/bin/install-mold.sh
RUN bash /usr/local/bin/install-mold.sh RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
bash /usr/local/bin/install-mold.sh
# Install bloaty # Install bloaty
COPY install-bloaty.sh /usr/local/bin/install-bloaty.sh COPY install-bloaty.sh /usr/local/bin/install-bloaty.sh
RUN if [ "$ARCH" != "riscv64" ]; then \ RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
if [ "$ARCH" == "amd64" ]; then \
bash /usr/local/bin/install-bloaty.sh; \ bash /usr/local/bin/install-bloaty.sh; \
else \ else \
echo "Skipping bloaty installation for RISC-V."; \ echo "Skipping bloaty installation for $ARCH."; \
fi fi
RUN apk del linux-headers
# Install size-optimized and static-link-optimized libstdc++
COPY install-toolchain.sh /usr/local/bin/install-toolchain.sh
RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
bash /usr/local/bin/install-toolchain.sh $TOOLCHAIN_OPTIMIZE $TARGET_ARCHS
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 bash /usr/local/bin/install-static-libs.sh gcc clang-19 :alpine
# Install the *real* ninja... RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
# TODO: move this up if we change anything --mount=type=cache,id=cfgcache,target=/root/.cfgcache \
RUN apk add --no-cache ninja-build bash /usr/local/bin/install-static-libs.sh :all $TARGET_ARCHS
# Install UPX
# UPX isn't supported on RISC-V/S390 (yet), so skip this
RUN if ! [ "$ARCH" == "amd64" ] || [ "$ARCH" == "arm64v8" ]; then \
wget -O - https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-$(bash -c "echo \${0//v8/}" $ARCH)_linux.tar.xz | tar -xJf - -C /usr/local/bin --strip-components=1 --wildcards "*/upx"; \
else \
echo "Skipping UPX installation for $ARCH architecture while it is not supported."; \
echo "See https://github.com/upx/upx/discussions/793 for details."; \
fi
# Set up git & user # Set up git & user
RUN git config --global --add safe.directory /workspace RUN git config --global --add safe.directory /workspace

108
.docker/Dockerfile.alpine-xx
View File

@ -1,108 +0,0 @@
# syntax=docker/dockerfile:1
ARG ARCH=amd64
FROM $ARCH/alpine:latest
ARG ARCH
ARG TARGET_ARCHS=$ARCH
ARG TOOLCHAIN_OPTIMIZE=s
RUN apk update
RUN apk upgrade
RUN qemu_pkgs=""; \
for arch in $(echo $TARGET_ARCHS | tr ',' ' '); do \
qemu_pkgs="$qemu_pkgs qemu-$arch"; \
done; \
apk add --no-cache \
bash-completion \
build-base \
wget \
curl \
vim \
tar \
ripgrep \
less \
gcc \
g++ \
clang19 \
git \
xz \
gzip \
bzip2 \
zstd \
ccache \
ninja-build \
cmake \
make \
bison \
flex \
ronn \
fuse \
fuse3 \
pkgconf \
meson \
autoconf \
strace \
gdb \
gmp-dev \
zlib-static \
zstd-static \
zlib-dev \
zstd-dev \
mpfr-dev \
mpc1-dev \
isl-dev \
texinfo \
linux-headers \
rsync \
$qemu_pkgs
COPY fetch.sh /usr/local/bin/fetch.sh
# Install mold
COPY install-mold.sh /usr/local/bin/install-mold.sh
RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
bash /usr/local/bin/install-mold.sh
# Install bloaty
COPY install-bloaty.sh /usr/local/bin/install-bloaty.sh
RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
if [ "$ARCH" == "amd64" ]; then \
bash /usr/local/bin/install-bloaty.sh; \
else \
echo "Skipping bloaty installation for $ARCH."; \
fi
RUN apk del linux-headers
# Install size-optimized and static-link-optimized libstdc++
COPY install-toolchain.sh /usr/local/bin/install-toolchain.sh
RUN --mount=type=cache,id=ccache,target=/root/.ccache --mount=type=cache,id=pkgcache,target=/root/.pkgcache \
bash /usr/local/bin/install-toolchain.sh $TARGET_ARCHS $TOOLCHAIN_OPTIMIZE
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
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 \
--mount=type=cache,id=cfgcache,target=/root/.cfgcache \
bash /usr/local/bin/install-static-libs.sh :all $TARGET_ARCHS
# Install UPX
# UPX isn't supported on RISC-V/S390 (yet), so skip this
RUN if ! [ "$ARCH" == "amd64" ] || [ "$ARCH" == "arm64v8" ]; then \
wget -O - https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-$(bash -c "echo \${0//v8/}" $ARCH)_linux.tar.xz | tar -xJf - -C /usr/local/bin --strip-components=1 --wildcards "*/upx"; \
else \
echo "Skipping UPX installation for $ARCH architecture while it is not supported."; \
echo "See https://github.com/upx/upx/discussions/793 for details."; \
fi
# Set up git & user
RUN git config --global --add safe.directory /workspace
RUN adduser -G users -s bash -u 1000 -D mhx
USER mhx
ENTRYPOINT /workspace/.docker/build-linux.sh

16
.docker/Makefile
View File

@ -1,8 +1,6 @@
IMAGE_UBUNTU="dwarfs-buildenv" IMAGE_UBUNTU="dwarfs-buildenv"
IMAGE_DEBIAN="dwarfs-buildenv-debian" IMAGE_DEBIAN="dwarfs-buildenv-debian"
IMAGE_ALPINE="dwarfs-buildenv-alpine" IMAGE_ALPINE="dwarfs-buildenv-alpine"
IMAGE_ALPINE_RISCV="dwarfs-buildenv-alpine-riscv64"
IMAGE_ALPINE_XX="dwarfs-buildenv-alpine-xx"
IMAGE_UBUNTU2204="dwarfs-buildenv-ubuntu2204" IMAGE_UBUNTU2204="dwarfs-buildenv-ubuntu2204"
IMAGE_FEDORA="dwarfs-buildenv-fedora" IMAGE_FEDORA="dwarfs-buildenv-fedora"
IMAGE_ARCH="dwarfs-buildenv-arch" IMAGE_ARCH="dwarfs-buildenv-arch"
@ -35,23 +33,11 @@ run_debian:
@docker run $(COMMON_RUN_OPTS) $(IMAGE_DEBIAN) @docker run $(COMMON_RUN_OPTS) $(IMAGE_DEBIAN)
build_alpine: build_alpine:
docker build -f Dockerfile.alpine -t $(IMAGE_ALPINE) . docker buildx build -f Dockerfile.alpine --build-arg TARGET_ARCHS=x86_64,aarch64,riscv64,i386 -t $(IMAGE_ALPINE) .
run_alpine: run_alpine:
@docker run $(COMMON_RUN_OPTS) $(IMAGE_ALPINE) @docker run $(COMMON_RUN_OPTS) $(IMAGE_ALPINE)
build_alpine_xx:
docker buildx build -f Dockerfile.alpine-xx --build-arg TARGET_ARCHS=x86_64,riscv64,i386 -t $(IMAGE_ALPINE_XX) .
run_alpine_xx:
@docker run $(COMMON_RUN_OPTS) $(IMAGE_ALPINE_XX)
build_alpine_riscv:
docker build -f Dockerfile.alpine -t $(IMAGE_ALPINE_RISCV) --build-arg ARCH=riscv64 .
run_alpine_riscv:
@docker run $(COMMON_RUN_OPTS) $(IMAGE_ALPINE_RISCV)
build_ubuntu2204: build_ubuntu2204:
docker build -f Dockerfile.ubuntu-2204 -t $(IMAGE_UBUNTU2204) . docker build -f Dockerfile.ubuntu-2204 -t $(IMAGE_UBUNTU2204) .

23
.docker/install-static-libs.sh
View File

@ -9,7 +9,7 @@ cd pkgs
ARCH="$(uname -m)" ARCH="$(uname -m)"
GCC="gcc" GCC="gcc"
CLANG="clang" CLANG="clang-20"
PKGS="$1" PKGS="$1"
TARGET_ARCH_STR="${2:-${ARCH}}" TARGET_ARCH_STR="${2:-${ARCH}}"
@ -398,16 +398,17 @@ EOF
fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/musl-exception-specification-errors.patch - | patch -p1 fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/musl-exception-specification-errors.patch - | patch -p1
fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/pkgconf.patch - | patch -p1 fetch.sh https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/pkgconf.patch - | patch -p1
./autogen.sh ${TRIPLETS} ./autogen.sh ${TRIPLETS}
# 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 --disable-stats --disable-prof --enable-static --disable-shared --disable-log --disable-debug ../configure ${TRIPLETS} --prefix="$INSTALL_DIR-jemalloc-minimal" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \
# make -j$(nproc) --disable-stats --disable-prof --enable-static --disable-shared --disable-log --disable-debug \
# make install --cache-file=$HOME/.cfgcache/jemalloc-minimal-${JEMALLOC_VERSION}-${CARCH}-${COMPILER}.cache
# cd .. make -j$(nproc)
# mkdir build-full make install
mkdir build cd ..
cd build mkdir build-full
../configure ${TRIPLETS} --prefix="$INSTALL_DIR" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 \ cd build-full
../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 --cache-file=$HOME/.cfgcache/jemalloc-${JEMALLOC_VERSION}-${CARCH}-${COMPILER}.cache
make -j$(nproc) make -j$(nproc)

24
.docker/install-toolchain.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
ARCH="$(uname -m)" ARCH="$(uname -m)"
TARGET_ARCH_STR="${1:-$ARCH}" OPTIMIZE_STR="${1:-s}"
OPTIMIZE_STR="${2:-s}" TARGET_ARCH_STR="${2:-$ARCH}"
BINUTILS_VERSION=2.44 BINUTILS_VERSION=2.44
GCC_VERSION=14.2.0 GCC_VERSION=14.2.0
@ -173,14 +173,20 @@ for target_arch in ${TARGET_ARCH_STR//,/ }; do
make -j"$(nproc)" ${GCC_NODOCS} make -j"$(nproc)" ${GCC_NODOCS}
make install make install
# Symbolic links for clang # Directory for ccache symlinks
ln -s /usr/bin/clang $PREFIX/bin/$TARGET-clang
ln -s /usr/bin/clang++ $PREFIX/bin/$TARGET-clang++
# Also provide ccache symlinks
mkdir -p $PREFIX/lib/ccache/bin mkdir -p $PREFIX/lib/ccache/bin
for binary in gcc g++ clang clang++; do
ln -s /usr/bin/ccache $PREFIX/lib/ccache/bin/$TARGET-$binary # Symbolic links for clang
for clang_binary in /usr/bin/clang{++,}{-[1-9]*,}; do
name=$(basename $clang_binary)
ln -s $clang_binary $PREFIX/bin/$TARGET-$name
ln -s /usr/bin/ccache $PREFIX/lib/ccache/bin/$TARGET-$name
done
# Also provide ccache symlinks for gcc
for gcc_binary in $PREFIX/bin/$TARGET-{c++,g++,gcc,gcc-[1-9]*}; do
name=$(basename $gcc_binary)
ln -s /usr/bin/ccache $PREFIX/lib/ccache/bin/$name
done done
done done
done done