From 141c0ab3bac2919627cb80632ae17abe96a48c7c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 4 Jul 2011 10:56:35 +0200 Subject: [PATCH] xbps-src: only process broken_as_needed in one place. --- xbps-src/shutils/build_funcs.sh | 6 ------ xbps-src/shutils/configure_funcs.sh | 5 ----- xbps-src/shutils/tmpl_funcs.sh.in | 5 +++++ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/xbps-src/shutils/build_funcs.sh b/xbps-src/shutils/build_funcs.sh index 350f441814..3091b13ad0 100644 --- a/xbps-src/shutils/build_funcs.sh +++ b/xbps-src/shutils/build_funcs.sh @@ -78,12 +78,6 @@ build_src_phase() fi fi - # Disable -Wl,--as-needed if requested! - if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then - export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")" - export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS" - fi - if [ "$build_style" = "custom-install" ]; then run_func do_build else diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh index 07e044304b..7c6e1e3b41 100644 --- a/xbps-src/shutils/configure_funcs.sh +++ b/xbps-src/shutils/configure_funcs.sh @@ -105,11 +105,6 @@ configure_src_phase() cd $build_wrksrc || return 1 fi - if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then - export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")" - export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS" - fi - case "$build_style" in gnu_configure|gnu-configure) run_func do_gnu_configure ;; configure) run_func do_configure ;; diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in index c894fcd368..3b0a7f9877 100644 --- a/xbps-src/shutils/tmpl_funcs.sh.in +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -298,6 +298,11 @@ set_tmpl_common_vars() export CPPFLAGS="$XBPS_CPPFLAGS $CPPFLAGS" export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS" + if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then + export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")" + export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS" + fi + if [ -z "$in_chroot" ]; then export CPPFLAGS="-I$XBPS_MASTERDIR/usr/include" if [ -d /usr/lib/libfakeroot ]; then