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

xbps-src: fucking (un)set_build_vars() crap!

Browse source
This commit is contained in:
Juan RP 2010-05-21 01:06:22 +02:00
parent f70a0e85b9
commit f6b57540bd
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xbps-src/shutils/buildvars_funcs.sh
View file

@ -47,33 +47,23 @@ set_build_vars()
export CC="gcc -m32" export CC="gcc -m32"
export CXX="g++ -m32" export CXX="g++ -m32"
fi fi
PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config" export CPPFLAGS="-I$XBPS_MASTERDIR/usr/include"
PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig" export LDFLAGS="$LDFLAGS"
export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
export LD_LIBRARY_PATH="$LDLIBPATH" export LD_LIBRARY_PATH="$LDLIBPATH"
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
export PKG_CONFIG="$PKG_CONFIG"
else
export PKG_CONFIG="/usr/bin/pkg-config"
export PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
fi fi
if [ -z "${_BUILD_VARS_CFLAGS_SET}" ]; then export PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
export CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS" export PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
export CFLAGS="$CFLAGS $XBPS_CFLAGS" export CFLAGS="$CFLAGS $XBPS_CFLAGS"
export CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS" export CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
_BUILD_VARS_CFLAGS_SET=1
fi
} }
unset_build_vars() unset_build_vars()
{ {
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH LDFLAGS
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
[ -n "$BUILD_32BIT" ] && unset CC CXX
fi fi
if [ -n "$BUILD_32BIT" ]; then unset PKG_CONFIG PKG_CONFIG_LIBDIR
unset CC CXX unset CPPFLAGS CFLAGS CXXFLAGS
fi
unset PKG_CONFIG LDFLAGS CPPFLAGS PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS
} }