From 99d8ab648e5a5e5a96bb45a7b44d90482e153e27 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 23 Jul 2014 15:23:18 +0200
Subject: [PATCH] hooks/gen-pkg: keep provides for 32bit conversion before
 creating -dbg subpkgs.

---
 common/hooks/do-pkg/00-gen-pkg.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index b4c42d4d2b2..fae32751cd3 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -135,6 +135,12 @@ hook() {
 
 	genpkg ${repo} ${arch} "${short_desc}" ${pkgver} ${binpkg}
 
+	for f in ${provides}; do
+		_pkgn="$($XBPS_UHELPER_CMD getpkgname $f)"
+		_pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
+		_provides+=" ${_pkgn}-32bit-${_pkgv}"
+	done
+
 	# Generate -dbg pkg.
 	if [ -d "${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}" ]; then
 		source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
@@ -150,11 +156,6 @@ hook() {
 		return
 	fi
 	if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then
-		for f in ${provides}; do
-			_pkgn="$($XBPS_UHELPER_CMD getpkgname $f)"
-			_pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)"
-			_provides+=" ${_pkgn}-32bit-${_pkgv}"
-		done
 		source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
 		if [ -n "$nonfree" ]; then
 			repo=$XBPS_REPOSITORY/multilib/nonfree