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

shutils/buildvars_funcs: don't set useless vars in the chroot. 

--HG--
extra : convert_revision : b75790e760fe12b2ac1d1f8dbc9c01aa3683e416
This commit is contained in:
Juan RP 2010-01-17 08:47:14 +01:00
parent c738804a07
commit 5f94abb06a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
#- #-
# Copyright (c) 2008 Juan Romero Pardines. # Copyright (c) 2008-2010 Juan Romero Pardines.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,24 +35,26 @@ set_build_vars()
LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib" LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib"
PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config" PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig" PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
LDFLAGS="-L$XBPS_MASTERDIR/usr/lib"
CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS"
export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
export PKG_CONFIG="$PKG_CONFIG" export PKG_CONFIG="$PKG_CONFIG"
fi fi
LDFLAGS="-L$XBPS_MASTERDIR/usr/lib"
CFLAGS="$CFLAGS $XBPS_CFLAGS" CFLAGS="$CFLAGS $XBPS_CFLAGS"
CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS" CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS"
export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
} }
unset_build_vars() unset_build_vars()
{ {
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
unset LDFLAGS CPPFLAGS
unset PKG_CONFIG LD_LIBRARY_PATH unset PKG_CONFIG LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
fi fi
unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS unset CFLAGS CXXFLAGS
} }