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

wip: fix

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-07-24 09:35:14 +02:00
parent 735e798156
commit d4f3f746b2
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,8 +590,6 @@ EOF
ninja install ninja install
fi fi
unset SSL_PREFIXES
if use_lib openssl; then if use_lib openssl; then
opt_size opt_size
cd "$WORKDIR" cd "$WORKDIR"
@ -607,7 +605,6 @@ EOF
make -j$(nproc) build_libs make -j$(nproc) build_libs
make install_dev make install_dev
SSL_PREFIXES="$SSL_PREFIXES $INSTALL_DIR_OPENSSL"
fi fi
if use_lib libressl; then if use_lib libressl; then
@ -622,11 +619,6 @@ EOF
${CMAKE_ARGS} ${CMAKE_ARGS}
ninja ninja
ninja install ninja install
SSL_PREFIXES="$SSL_PREFIXES $INSTALL_DIR_LIBRESSL"
fi
if [[ -z "$SSL_PREFIXES" ]]; then
SSL_PREFIXES="$INSTALL_DIR"
fi fi
if use_lib libevent; then if use_lib libevent; then
@ -645,13 +637,24 @@ EOF
ninja install ninja install
fi fi
SSL_PREFIXES=""
if [ -d "$INSTALL_DIR_OPENSSL" ]; then
SSL_PREFIXES="$SSL_PREFIXES $INSTALL_DIR_OPENSSL"
fi
if [ -d "$INSTALL_DIR_LIBRESSL" ]; then
SSL_PREFIXES="$SSL_PREFIXES $INSTALL_DIR_LIBRESSL"
fi
if [[ -z "$SSL_PREFIXES" ]]; then
SSL_PREFIXES="$INSTALL_DIR"
fi
if use_lib libarchive; then if use_lib libarchive; then
for prefix in $SSL_PREFIXES; do for prefix in $SSL_PREFIXES; do
opt_size opt_size
# This is safe because `opt_size` will re-initialize CFLAGS, CPPFLAGS, and LDFLAGS # This is safe because `opt_size` will re-initialize CFLAGS, CPPFLAGS, and LDFLAGS
export CFLAGS="-I$prefix/include $CFLAGS" export CFLAGS="-I$prefix/include $CFLAGS"
export CPPFLAGS="-I$prefix/include $CPPFLAGS" export CPPFLAGS="-I$prefix/include $CPPFLAGS"
export LDFLAGS="-L$prefix/lib $LDFLAGS" export LDFLAGS="-L$prefix/lib $LDFLAGS -latomic"
cd "$WORKDIR" cd "$WORKDIR"
rm -rf libarchive-${LIBARCHIVE_VERSION} rm -rf libarchive-${LIBARCHIVE_VERSION}
tar xf ${WORKROOT}/${LIBARCHIVE_TARBALL} tar xf ${WORKROOT}/${LIBARCHIVE_TARBALL}