mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-06-12 17:14:46 +02:00
Restore LDFLAGS after setting it in library compiles
But is this enough...?
This commit is contained in:
@@ -8752,11 +8752,13 @@ fi
|
||||
printf "%s\n" "configuring PCRE2 regex library" >&6; }
|
||||
cd pcre2-$pcre2_version
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
|
||||
LDFLAGS="$HARDEN_LIB_LDFLAGS"
|
||||
export CFLAGS LDFLAGS
|
||||
./configure --enable-jit --enable-shared --prefix=$cur_dir/extras/pcre2 --libdir=$PRIVATELIBDIR || exit 1
|
||||
CFLAGS="$save_cflags"
|
||||
LDFLAGS="$save_ldflags"
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling PCRE2 regex library" >&5
|
||||
printf "%s\n" "compiling PCRE2 regex library" >&6; }
|
||||
$ac_cv_prog_MAKER || exit 1
|
||||
@@ -8879,6 +8881,7 @@ else
|
||||
tar xf argon2.tar
|
||||
fi
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
|
||||
LDFLAGS="$HARDEN_LIB_LDFLAGS"
|
||||
export CFLAGS LDFLAGS
|
||||
@@ -8898,6 +8901,7 @@ rm -f "$PRIVATELIBDIR/"libargon2*
|
||||
# Now copy the new library files:
|
||||
cp -av $cur_dir/extras/argon2/lib/* $PRIVATELIBDIR/
|
||||
CFLAGS="$save_cflags"
|
||||
LDFLAGS="$save_ldflags"
|
||||
ARGON2_CFLAGS="-I$cur_dir/extras/argon2/include"
|
||||
|
||||
ARGON2_LIBS="-L$PRIVATELIBDIR -largon2"
|
||||
@@ -9008,11 +9012,13 @@ fi
|
||||
printf "%s\n" "compiling sodium library" >&6; }
|
||||
cd libsodium-$sodium_version
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
|
||||
LDFLAGS="$HARDEN_LIB_LDFLAGS"
|
||||
export CFLAGS LDFLAGS
|
||||
./configure --prefix=$cur_dir/extras/sodium --libdir=$PRIVATELIBDIR --enable-shared --disable-static --enable-opt || exit 1
|
||||
CFLAGS="$save_cflags"
|
||||
LDFLAGS="$save_ldflags"
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling sodium resolver library" >&5
|
||||
printf "%s\n" "compiling sodium resolver library" >&6; }
|
||||
$ac_cv_prog_MAKER || exit 1
|
||||
@@ -9138,11 +9144,13 @@ fi
|
||||
printf "%s\n" "configuring c-ares library" >&6; }
|
||||
cd c-ares-$cares_version
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
|
||||
LDFLAGS="$HARDEN_LIB_LDFLAGS"
|
||||
export CFLAGS LDFLAGS
|
||||
./configure --prefix=$cur_dir/extras/c-ares --libdir=$PRIVATELIBDIR --enable-shared --disable-tests || exit 1
|
||||
CFLAGS="$save_cflags"
|
||||
LDFLAGS="$save_ldflags"
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling c-ares resolver library" >&5
|
||||
printf "%s\n" "compiling c-ares resolver library" >&6; }
|
||||
$ac_cv_prog_MAKER || exit 1
|
||||
@@ -9285,11 +9293,13 @@ fi
|
||||
printf "%s\n" "compiling jansson library" >&6; }
|
||||
cd jansson-$jansson_version
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
CFLAGS="$orig_cflags $HARDEN_LIB_CFLAGS"
|
||||
LDFLAGS="$HARDEN_LIB_LDFLAGS"
|
||||
export CFLAGS LDFLAGS
|
||||
./configure --prefix=$cur_dir/extras/jansson --libdir=$PRIVATELIBDIR --enable-shared --disable-static || exit 1
|
||||
CFLAGS="$save_cflags"
|
||||
LDFLAGS="$save_ldflags"
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: compiling jansson resolver library" >&5
|
||||
printf "%s\n" "compiling jansson resolver library" >&6; }
|
||||
$ac_cv_prog_MAKER || exit 1
|
||||
|
||||
Reference in New Issue
Block a user