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

environment/gnu-configure-args: only set args in two specific cases.

Browse source 
Only set configure_args if build_style is unset or build_style=gnu-configure.
In other cases it's not really necessary to set them.
This commit is contained in:
Juan RP 2014-11-23 11:16:39 +01:00
parent b879da66aa
commit e68ead38a0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/environment/configure/gnu-configure-args.sh
View file

@ -1,17 +1,17 @@
# This file sets up configure_args with common settings.
if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then
export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then
return 0
fi
export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# on x86 use /usr/lib32 as libdir, but just as fake directory,
# because /usr/lib32 is a symlink to /usr/lib in void.
if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then
export configure_args+=" --libdir=/usr/lib32"
fi
export configure_args+=" --libdir=/usr/lib32"
fi
# Cross compilation vars