From e13c7ffe78c84824a91e3d887ef81aa5b820bf78 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 18 Aug 2014 13:43:39 +0200
Subject: [PATCH] hooks/prepare-32bit: fix shlib-provides detection for non
 subpkgs.

---
 common/hooks/post-install/06-prepare-32bit.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/hooks/post-install/06-prepare-32bit.sh b/common/hooks/post-install/06-prepare-32bit.sh
index 418f034726..106a0f380d 100644
--- a/common/hooks/post-install/06-prepare-32bit.sh
+++ b/common/hooks/post-install/06-prepare-32bit.sh
@@ -101,7 +101,7 @@ hook() {
 			fi
 			# If dependency is a development pkg switch it to 32bit.
 			if [[ $pkgn =~ '-devel' ]]; then
-				echo "   RDEP: $f -> ${pkgn}-32bit${pkgv}"
+				echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (development)"
 				printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				continue
 			fi
@@ -123,9 +123,9 @@ hook() {
 			if [ -z "$found" ]; then
 				# Dependency is not a subpkg, check shlib-provides
 				# via binpkgs.
-				_shprovides="$($XBPS_QUERY_CMD -R --property=shlib-provides "$f")"
+				_shprovides="$($XBPS_QUERY_CMD -R --property=shlib-provides "$pkgn")"
 				if [ -n "${_shprovides}" ]; then
-					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv}"
+					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (shlib-provides)"
 					printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				else
 					echo "   RDEP: $f -> ${pkgn}${pkgv} (no shlib-provides)"
@@ -135,7 +135,7 @@ hook() {
 				if [ -s ${XBPS_DESTDIR}/${pkgn}-${version}/shlib-provides ]; then
 					# Dependency is a subpkg; check if it provides any shlib
 					# and convert to 32bit if true.
-					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv}"
+					echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (subpkg, shlib-provides)"
 					printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				else
 					echo "   RDEP: $f -> ${pkgn}${pkgv} (subpkg, no shlib-provides)"