From bb5508075939ee5dab6cb8a87a42fdc7a9e142b9 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Wed, 21 May 2025 23:04:46 +0200 Subject: [PATCH] build: use full and minimal jemalloc configurations --- .docker/build-linux.sh | 7 +++++-- .docker/install-static-libs.sh | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh index f743b11a..909ebada 100755 --- a/.docker/build-linux.sh +++ b/.docker/build-linux.sh @@ -308,15 +308,18 @@ if [[ "-$BUILD_TYPE-" == *-static-* ]]; then export LDFLAGS="${LDFLAGS} -lz" fi CMAKE_ARGS="${CMAKE_ARGS} -DSTATIC_BUILD_DO_NOT_USE=1 -DWITH_UNIVERSAL_BINARY=1 -DWITH_FUSE_EXTRACT_BINARY=1" - if [[ "$BUILD_TYPE" != *-minimal-* ]]; then + if [[ "$BUILD_TYPE" == *-minimal-* ]]; then + _jemallocprefix="/opt/static-libs/$COMPILER-jemalloc-minimal" + else CMAKE_ARGS="${CMAKE_ARGS} -DWITH_PXATTR=1" + _jemallocprefix="/opt/static-libs/$COMPILER-jemalloc-full" fi if [[ "$BUILD_TYPE" == *-libressl-* ]]; then _sslprefix="/opt/static-libs/$COMPILER-libressl" else _sslprefix="/opt/static-libs/$COMPILER-openssl" fi - CMAKE_ARGS="${CMAKE_ARGS} -DSTATIC_BUILD_EXTRA_PREFIX=/opt/static-libs/$COMPILER;$_sslprefix" + CMAKE_ARGS="${CMAKE_ARGS} -DSTATIC_BUILD_EXTRA_PREFIX=/opt/static-libs/$COMPILER;$_sslprefix;$_jemallocprefix" fi INSTALLDIR="$HOME/install" diff --git a/.docker/install-static-libs.sh b/.docker/install-static-libs.sh index e0dedfd3..41573e16 100644 --- a/.docker/install-static-libs.sh +++ b/.docker/install-static-libs.sh @@ -249,7 +249,15 @@ for COMPILER in $COMPILERS; do curl https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/musl-exception-specification-errors.patch | patch -p1 curl https://gitlab.alpinelinux.org/alpine/aports/-/raw/abc0b4170e42e2a7d835e4490ecbae49e6f3d137/main/jemalloc/pkgconf.patch | patch -p1 ./autogen.sh - ./configure --prefix="$INSTALL_DIR" --localstatedir=/var --sysconfdir=/etc --with-lg-hugepage=21 --disable-stats --disable-prof --enable-static --disable-shared --disable-log --disable-debug + mkdir build-minimal + cd build-minimal + ../configure --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 + make -j$(nproc) + make install + cd .. + mkdir build-full + cd build-full + ../configure --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 make -j$(nproc) make install fi