moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: set default compiler/preprocessor/linker flags via etc/conf.

Browse source 
Rather than setting them in the build profile, just set them in
etc/defaults.conf (overridable via etc/conf) to simplify the code.

- Also enable _FORTIFY_SOURCE=2 in CPPFLAGS.
- Also enable -z,relro in LDFLAGS.

As suggested by @chneukirchen.
This commit is contained in:
Juan RP 2015-03-04 15:17:05 +01:00
parent 6cf2ac3983
commit 50a116d27a
21 changed files with 27 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/xbps-src/shutils/common.sh
View file

@ -352,17 +352,18 @@ setup_pkg() {
dbgflags="-g"
fi
if [ -z "$XBPS_CFLAGS" -a -z "$XBPS_CXXFLAGS" ]; then
if [ -z "$cross" ]; then
if [ -z "$CHROOT_READY" ]; then
source_file ${XBPS_COMMONDIR}/build-profiles/bootstrap.sh
else
source_file ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
fi
fi
export CFLAGS="$XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
export CXXFLAGS="$XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
export CPPFLAGS="$XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
export CPPFLAGS="$XBPS_TARGET_CPPFLAGS $XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
export LDFLAGS="$XBPS_TARGET_LDFLAGS $XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
if [ -n "$broken_as_needed" ]; then
LDFLAGS="${LDFLAGS/-Wl,--as-needed/}"