teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build_vars: (un)set PKG_CONFIG also in the chroot.

Browse Source
This commit is contained in:
Juan RP 2010-05-11 22:15:33 +02:00
parent d3047787ba
commit 622c398a66
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xbps-src/shutils/buildvars_funcs.sh
View File

@ -49,21 +49,21 @@ set_build_vars()
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
export PKG_CONFIG="$PKG_CONFIG" export PKG_CONFIG="$PKG_CONFIG"
else else
PKG_CONFIG="/usr/bin/pkg-config"
PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
fi fi
CFLAGS="$CFLAGS $XBPS_CFLAGS" CFLAGS="$CFLAGS $XBPS_CFLAGS"
CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS" CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" \ export PKG_CONFIG="$PKG_CONFIG" PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" \
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
} }
unset_build_vars() unset_build_vars()
{ {
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
unset LDFLAGS CPPFLAGS unset LDFLAGS CPPFLAGS LD_LIBRARY_PATH
unset PKG_CONFIG LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
fi fi
unset PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS unset PKG_CONFIG PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS
} }