From 5c8d0c01b376cd29fdbaac54d841b1885607a136 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 3 Mar 2009 19:06:27 +0100
Subject: [PATCH] Make (un)set_build_vars() work inside of the chroot.

This has the effect to really pass the XBPS_C(XX)FLAGS values from
xbps.conf to the packages built there.

--HG--
extra : convert_revision : 87ea9f6a755ba3f60a095391d2b0069ab22cb742
---
 shutils/build_funcs.sh     | 11 ++++-------
 shutils/buildvars_funcs.sh | 25 +++++++++++++++----------
 shutils/configure_funcs.sh | 12 +++---------
 shutils/install_funcs.sh   | 10 +++-------
 shutils/tmpl_funcs.sh      |  6 ++----
 5 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/shutils/build_funcs.sh b/shutils/build_funcs.sh
index 4f1ebc837fd..106de3833d4 100644
--- a/shutils/build_funcs.sh
+++ b/shutils/build_funcs.sh
@@ -72,10 +72,11 @@ build_src_phase()
 	if [ -z "$in_chroot" ]; then
 		. $XBPS_SHUTILSDIR/libtool_funcs.sh
 		libtool_fixup_file
-		. $XBPS_SHUTILSDIR/buildvars_funcs.sh
-		set_build_vars
 	fi
 
+	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
+	set_build_vars
+
 	msg_normal "Running build phase for $pkg."
 
 	#
@@ -100,10 +101,6 @@ build_src_phase()
 
 	# unset cross compiler vars.
 	[ -n "$cross_compiler" ] && cross_compile_unsetvars
-
-	if [ -z "$in_chroot" ]; then
-		unset_build_vars
-	fi
-
+	unset_build_vars
 	touch -f $XBPS_BUILD_DONE
 }
diff --git a/shutils/buildvars_funcs.sh b/shutils/buildvars_funcs.sh
index 758ff361584..66af1f340ef 100644
--- a/shutils/buildvars_funcs.sh
+++ b/shutils/buildvars_funcs.sh
@@ -30,24 +30,29 @@
 
 set_build_vars()
 {
+	if [ -z "$in_chroot" ]; then
+		SAVE_LDLIBPATH=$LD_LIBRARY_PATH
+		LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib"
+		PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
+		PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
+		export LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
+		export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
+		export PKG_CONFIG="$PKG_CONFIG"
+	fi
 	LDFLAGS="-L$XBPS_MASTERDIR/usr/lib"
-	SAVE_LDLIBPATH=$LD_LIBRARY_PATH
-	LD_LIBRARY_PATH="$XBPS_MASTERDIR/usr/lib"
 	CFLAGS="$CFLAGS $XBPS_CFLAGS"
 	CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
 	CPPFLAGS="-I$XBPS_MASTERDIR/usr/include $CPPFLAGS"
-	PKG_CONFIG="$XBPS_MASTERDIR/usr/bin/pkg-config"
-	PKG_CONFIG_LIBDIR="$XBPS_MASTERDIR/usr/lib/pkgconfig"
 
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
 	export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
-	export CPPFLAGS="$CPPFLAGS" PKG_CONFIG="$PKG_CONFIG"
-	export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
-	export LDFLAGS="$LDFLAGS"
+	export CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 unset_build_vars()
 {
-	unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS PKG_CONFIG LD_LIBRARY_PATH
-	export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
+	if [ -z "$in_chroot" ]; then
+		unset PKG_CONFIG LD_LIBRARY_PATH
+		export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
+	fi
+	unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
 }
diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh
index b909b74c215..33fd9dc9958 100644
--- a/shutils/configure_funcs.sh
+++ b/shutils/configure_funcs.sh
@@ -78,10 +78,8 @@ configure_src_phase()
 
 	cd $wrksrc || exit 1
 
-	if [ -z "$in_chroot" ]; then
-		. $XBPS_SHUTILSDIR/buildvars_funcs.sh
-		set_build_vars
-	fi
+	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
+	set_build_vars
 
 	#
 	# Packages using GNU autoconf
@@ -131,10 +129,6 @@ configure_src_phase()
 
 	# unset cross compiler vars.
 	[ -n "$cross_compiler" ] && cross_compile_unsetvars
-
-	if [ -z "$in_chroot" ]; then
-		unset_build_vars
-	fi
-
+	unset_build_vars
 	touch -f $XBPS_CONFIGURE_DONE
 }
diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh
index bdec5340960..1432b645935 100644
--- a/shutils/install_funcs.sh
+++ b/shutils/install_funcs.sh
@@ -122,10 +122,8 @@ make_install()
 
 	[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
 
-	if [ -z "$in_chroot" ]; then
-		. $XBPS_SHUTILSDIR/buildvars_funcs.sh
-		set_build_vars
-	fi
+	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
+	set_build_vars
 
 	#
 	# Install package via make.
@@ -150,7 +148,5 @@ make_install()
 	done
 
 	# Unset build vars.
-	if [ -z "$in_chroot" ]; then
-		unset_build_vars
-	fi
+	unset_build_vars
 }
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index ead88b8cb99..0aa737f7916 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -77,10 +77,8 @@ reset_tmpl_vars()
 		eval unset "$v"
 	done
 
-	if [ -z "$in_chroot" ]; then
-		. $XBPS_SHUTILSDIR/buildvars_funcs.sh
-		unset_build_vars
-	fi
+	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
+	unset_build_vars
 }
 
 #