From 439807df63ab7366be438dabff51a39d66b9f09e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 23 Mar 2015 18:02:45 +0100
Subject: [PATCH] xbps-src: setup_pkg: re-read conf file to propagate vars to
 build.sh.

---
 common/xbps-src/shutils/common.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 1dade183662..9753f83069e 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -95,7 +95,6 @@ set_build_options() {
         return 0
     fi
 
-    . $XBPS_CONFIG_FILE 2>/dev/null
 
     for f in ${build_options}; do
         _pkgname=${pkgname//\-/\_}
@@ -223,6 +222,8 @@ setup_pkg() {
 
     unset_package_funcs
 
+    . $XBPS_CONFIG_FILE 2>/dev/null
+
     if [ -n "$cross" ]; then
         source_file $XBPS_CROSSPFDIR/${cross}.sh