From 959d9c361173b6f5ecff23efb4adffdc156f9b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 14 Aug 2021 09:20:30 +0200
Subject: [PATCH] guile: fix build on 32 bit x86 (#6125)

* guile: fix build on 32 bit x86

* add missing commandSuffix to provides
---
 dev-scheme/guile/guile-2.2.7.recipe  | 8 +++++---
 dev-scheme/guile/guile1-1.8.8.recipe | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-scheme/guile/guile-2.2.7.recipe b/dev-scheme/guile/guile-2.2.7.recipe
index 7394fc36f..3733d8e1f 100644
--- a/dev-scheme/guile/guile-2.2.7.recipe
+++ b/dev-scheme/guile/guile-2.2.7.recipe
@@ -18,9 +18,11 @@ SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
+relativeCommandBinDir=$relativeBinDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
+	relativeCommandBinDir=bin
 fi
 
 libguileVersion="1.4.2"
@@ -66,7 +68,7 @@ REQUIRES_tools="
 
 PROVIDES_devel="
 	guile${secondaryArchSuffix}_devel = $portVersionCompat
-	cmd:guile_config$secondaryArchSuffix = $portVersion
+	cmd:guile_config$commandSuffix = $portVersion
 	devel:libguile_$portVers$secondaryArchSuffix = $libguileVersionCompat
 	"
 REQUIRES_devel="
@@ -97,7 +99,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage guile$secondaryArchSuffix \
-	$(getPackagePrefix tools)/"$relativeBinDir"/guile \
+	$(getPackagePrefix tools)/"$relativeCommandBinDir"/guile \
 	"$libDir"/libguile-$portVers.so.$libguileVersion
 
 BUILD()
@@ -134,7 +136,7 @@ INSTALL()
 		"$manDir"
 
 	packageEntries devel \
-		"$binDir"/guile-config \
+		"$commandBinDir"/guile-config \
 		"$dataDir"/aclocal \
 		"$developDir"
 }
diff --git a/dev-scheme/guile/guile1-1.8.8.recipe b/dev-scheme/guile/guile1-1.8.8.recipe
index 2bccd827b..15745a16c 100644
--- a/dev-scheme/guile/guile1-1.8.8.recipe
+++ b/dev-scheme/guile/guile1-1.8.8.recipe
@@ -19,9 +19,11 @@ SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
+relativeCommandBinDir=$relativeBinDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
+	relativeCommandBinDir=bin
 fi
 
 libguileVersion="17.4.0"
@@ -104,7 +106,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage guile1$secondaryArchSuffix \
-	$(getPackagePrefix tools)/"$relativeBinDir"/guile \
+	$(getPackagePrefix tools)/"$relativeCommandBinDir"/guile \
 	"$libDir"/libguile.so.$libguileVersion \
 	"$libDir"/libguilereadline-v-17.so.17.0.3 \
 	"$libDir"/libguile-srfi-srfi-1-v-3.so.3.0.2 \