From f6f59dec8b740ac17567df9bf1352e7935687ce8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 27 Mar 2014 10:06:27 +0100
Subject: [PATCH] xbps-src: make sure that wrksrc is expanded after reading
 build-options.

---
 common/xbps-src/shutils/common.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index b8c9d32fe5..37d03a275d 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -309,13 +309,6 @@ setup_pkg() {
 		fi
 	fi
 
-	# Setup some specific package vars.
-	if [ -z "$wrksrc" ]; then
-		wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"
-	else
-		wrksrc="$XBPS_BUILDDIR/$wrksrc"
-	fi
-
 	FILESDIR=$XBPS_SRCPKGDIR/$sourcepkg/files
 	PATCHESDIR=$XBPS_SRCPKGDIR/$sourcepkg/patches
 	DESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${sourcepkg}-${version}
@@ -378,6 +371,13 @@ setup_pkg() {
 
 	set_build_options
 
+	# Setup some specific package vars.
+	if [ -z "$wrksrc" ]; then
+		wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"
+	else
+		wrksrc="$XBPS_BUILDDIR/$wrksrc"
+	fi
+
 }
 
 setup_pkg_depends() {