From 2f7839906c14b2fb76f6fe5666354d9a12651f08 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sat, 9 Nov 2019 20:36:12 +0000
Subject: Use setarch linux32 rather than target arch

$ setarch --list
uname26
linux32
linux64
armv7l
---
 lib/Iurt/Ulri.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Iurt/Ulri.pm b/lib/Iurt/Ulri.pm
index d085514..c9ec44e 100755
--- a/lib/Iurt/Ulri.pm
+++ b/lib/Iurt/Ulri.pm
@@ -80,8 +80,10 @@ sub build_package {
     plog('DEBUG', "Will compile only with media $media_to_add");
     $cmd =~ s!__MEDIA__!$media_to_add!g;
 
-    #- force the requested arch, this allows to build 32 bits package on 64 bit hosts
-    $cmd = "setarch $arch $cmd";
+    #- force 32bit if needed, this allows to build 32 bits package on 64 bit hosts
+    if ($arch =~ /^(i.86|armv5tl|armv7hl)/) {
+	$cmd = "setarch linux32 $cmd";
+    }
 
     plog('DEBUG', "Build $pkgs");
     ssh($remote, "'echo PID=\$\$; exec $cmd $pkgs &>$prefix_dir/log/botcmd.\$(date +%s).\$(hostname -s).log' > $temp &");
-- 
cgit v1.2.1