TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-08-03 17:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: use different versions of libarchive for openssl/libressl

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-05-26 14:27:36 +02:00 committed by mhx
parent bb55080759
commit 550dcecced
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,10 +144,11 @@ set_build_flags() {
echo "setting CXXFLAGS: $CXXFLAGS" echo "setting CXXFLAGS: $CXXFLAGS"
fi fi
if [[ $LDFLAGS =~ ^[[:space:]]*$ ]]; then if [[ $COMP_LDFLAGS =~ ^[[:space:]]*$ ]]; then
echo "unsetting LDFLAGS" echo "unsetting LDFLAGS"
unset LDFLAGS unset LDFLAGS
else else
export LDFLAGS="$COMP_LDFLAGS"
echo "setting LDFLAGS: $LDFLAGS" echo "setting LDFLAGS: $LDFLAGS"
fi fi
} }
@ -173,7 +174,7 @@ for COMPILER in $COMPILERS; do
export SIZE_CXXFLAGS="$COMMON_CXXFLAGS" export SIZE_CXXFLAGS="$COMMON_CXXFLAGS"
export PERF_CFLAGS="$COMMON_CFLAGS" export PERF_CFLAGS="$COMMON_CFLAGS"
export PERF_CXXFLAGS="$COMMON_CXXFLAGS" export PERF_CXXFLAGS="$COMMON_CXXFLAGS"
export LDFLAGS="$COMMON_LDFLAGS" export COMP_LDFLAGS="$COMMON_LDFLAGS"
case "$COMPILER" in case "$COMPILER" in
clang*) clang*)
@ -203,7 +204,7 @@ for COMPILER in $COMPILERS; do
export SIZE_CXXFLAGS="$SIZE_CXXFLAGS -flto" export SIZE_CXXFLAGS="$SIZE_CXXFLAGS -flto"
export PERF_CFLAGS="$PERF_CFLAGS -flto" export PERF_CFLAGS="$PERF_CFLAGS -flto"
export PERF_CXXFLAGS="$PERF_CXXFLAGS -flto" export PERF_CXXFLAGS="$PERF_CXXFLAGS -flto"
export LDFLAGS="$LDFLAGS -flto" export COMP_LDFLAGS="$COMP_LDFLAGS -flto"
;; ;;
esac esac
@ -429,15 +430,34 @@ for COMPILER in $COMPILERS; do
fi fi
if use_lib libarchive; then if use_lib libarchive; then
opt_size unset LIBARCHIVE_PREFIXES
cd "$HOME/pkgs/$COMPILER" if use_lib openssl; then
tar xf ../${LIBARCHIVE_TARBALL} LIBARCHIVE_PREFIXES="$LIBARCHIVE_PREFIXES $INSTALL_DIR-openssl"
cd libarchive-${LIBARCHIVE_VERSION} fi
# TODO: once DwarFS supports ACLs / xattrs, we need to update this if use_lib libressl; then
./configure --prefix="$INSTALL_DIR" --without-iconv --without-xml2 --without-expat --without-openssl \ LIBARCHIVE_PREFIXES="$LIBARCHIVE_PREFIXES $INSTALL_DIR-libressl"
--without-bz2lib --without-zlib --disable-acl --disable-xattr fi
make -j$(nproc) if [[ -z "$LIBARCHIVE_PREFIXES" ]]; then
make install LIBARCHIVE_PREFIXES="$INSTALL_DIR"
fi
for prefix in $LIBARCHIVE_PREFIXES; do
opt_size
cd "$HOME/pkgs/$COMPILER"
rm -rf libarchive-${LIBARCHIVE_VERSION}
tar xf ../${LIBARCHIVE_TARBALL}
cd libarchive-${LIBARCHIVE_VERSION}
# TODO: once DwarFS supports ACLs / xattrs, we need to update this
export CFLAGS="-I$prefix/include $CFLAGS"
export CPPFLAGS="-I$prefix/include $CPPFLAGS"
export LDFLAGS="-L$prefix/lib $LDFLAGS"
./configure --prefix="$prefix" \
--without-iconv --without-xml2 --without-expat \
--without-bz2lib --without-zlib \
--disable-shared --disable-acl --disable-xattr
make -j$(nproc)
make install
done
fi fi
if use_lib file; then if use_lib file; then