From 0b897e85ecd56078e08f7820dddcc41266109d5b Mon Sep 17 00:00:00 2001
From: "Kazushi (Jam) Marukawa" <jam@pobox.com>
Date: Tue, 15 Nov 2016 20:09:17 +0900
Subject: [PATCH] Add mechanism to strip "-m32" and substitute "lib32" into
 "lib" for the case of ARM to avoid SHORTARCH flood.

---
 crew           | 1 +
 lib/package.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/crew b/crew
index a0b5f2113..ffd2e34ea 100755
--- a/crew
+++ b/crew
@@ -15,6 +15,7 @@ CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/'
 CREW_BREW_DIR = CREW_PREFIX + '/tmp/crew/'
 CREW_DEST_DIR = CREW_BREW_DIR + '/dest'
 
+ARCH = `uname -m | tr -d '\n\r'`
 SHORTARCH = `getconf LONG_BIT | tr -d '\n\r'`
 
 $LOAD_PATH.unshift "#{CREW_LIB_PATH}lib"
diff --git a/lib/package.rb b/lib/package.rb
index b8fe9ef99..cf181c214 100644
--- a/lib/package.rb
+++ b/lib/package.rb
@@ -28,6 +28,12 @@ class Package
   end
 
   def self.system(*args)
+    # strip -m32 option and convert lib32 to lib for the case of ARM to avoid SHORTARCH flood
+    if ARCH == "armv7l"
+      args = args.map {|s| s.gsub("-m32", "")}
+      args = args.map {|s| s.gsub("lib32", "lib")}
+      puts *args
+    end
     Kernel.system(*args)
     exitstatus = $?.exitstatus
     raise InstallError.new("`#{args.join(" ")}` exited with #{exitstatus}") unless exitstatus == 0