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

set_build_vars(): use different var for LD_LIBRARY_PATH.

Browse source
This commit is contained in:
Juan RP 2010-05-10 10:41:36 +02:00
parent bdc7d896a7
commit d4441c94d3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,12 +30,14 @@
set_build_vars() set_build_vars()
{ {
local LDLIBPATH
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
SAVE_LDLIBPATH=$LD_LIBRARY_PATH SAVE_LDLIBPATH=$LD_LIBRARY_PATH
if [ -d /usr/lib/libfakeroot ]; then if [ -d /usr/lib/libfakeroot ]; then
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$XBPS_MASTERDIR/usr/lib" LDLIBPATH="/usr/lib/libfakeroot:$XBPS_MASTERDIR/usr/lib"
else else
LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib" LDLIBPATH="$XBPS_MASTERDIR/usr/lib"
fi fi
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"
@ -43,7 +45,7 @@ set_build_vars()
CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS" CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS"
export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$LDLIBPATH"
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