void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xbps-src: handle correctly {C,LD,CXX,CPP}FLAGS envvars.

Browse source
This commit is contained in:
Juan RP 2011-07-06 13:36:59 +02:00
parent 0fc9751dae
commit 40f6852c62
1 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -297,10 +297,29 @@ set_tmpl_common_vars()
fi fi
SRCPKGDESTDIR=${XBPS_DESTDIR}/${sourcepkg}-${version} SRCPKGDESTDIR=${XBPS_DESTDIR}/${sourcepkg}-${version}
if [ -n "$XBPS_CFLAGS" -a -n "$CFLAGS" ]; then
export CFLAGS="$XBPS_CFLAGS $CFLAGS" export CFLAGS="$XBPS_CFLAGS $CFLAGS"
export CXXFLAGS="$XBPS_CXXFLAGS $CXXFLAGS" elif [ -n "$XBPS_CFLAGS" -a -z "$CFLAGS" ]; then
export CPPFLAGS="$XBPS_CPPFLAGS $CPPFLAGS" export CFLAGS="$XBPS_CFLAGS"
fi
if [ -n "$XBPS_CXXFLAGS" -a -n "$CXXFLAGS" ]; then
export CXXFLAGS="$XBPS_CXXFLAGS"
elif [ -n "$XBPS_CXXFLAGS" -a -z "$CXXFLAGS" ]; then
export CXXFLAGS="$XBPS_CXXFLAGS"
fi
if [ -n "$XBPS_CPPFLAGS" -a -n "$CPPFLAGS" ]; then
export CPPFLAGS="$XBPS_CPPFLAGS"
elif [ -n "$XBPS_CPPFLAGS" -a -z "$CPPFLAGS" ]; then
export CPPFLAGS="$XBPS_CPPFLAGS"
fi
if [ -n "$XBPS_LDFLAGS" -a -n "$LDFLAGS" ]; then
export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS" export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS"
elif [ -n "$XBPS_LDFLAGS" -a -z "$LDFLAGS" ]; then
export LDFLAGS="$XBPS_LDFLAGS"
fi
if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then
export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")" export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")"