From ee1f54ca0101030beb047e89327dcb76feee0c1b Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 26 Feb 2012 17:09:08 +0100
Subject: [PATCH] Append "64bit" only on 64bit binary.

Don't rely on the build host having the same bitsize as the created binary.
Fixes building a 32bit binary getting a "64bit" postfix when built on a 64bit
Linux.

Change-Id: I2aa61dee82beddd60ebfc8e227551ea49d769664
---
 utils/common/deploy.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/utils/common/deploy.py b/utils/common/deploy.py
index a01954c42d..070cea65b5 100755
--- a/utils/common/deploy.py
+++ b/utils/common/deploy.py
@@ -76,6 +76,7 @@ systemdlls = ['advapi32.dll',
 
 gitrepo = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
 
+
 # == Functions ==
 def usage(myself):
     print "Usage: %s [options]" % myself
@@ -621,7 +622,7 @@ def deploy():
                 sys.exit(1)
         dllfiles = finddlls(sourcefolder + "/" + progexe[platform], \
                             [os.path.dirname(qm)], cross)
-        if dllfiles.count > 0:
+        if len(dllfiles) > 0:
             progfiles.extend(dllfiles)
         archive = zipball(progfiles, ver, sourcefolder, platform)
         # only when running native right now.
@@ -632,8 +633,16 @@ def deploy():
     elif platform == "darwin":
         archive = macdeploy(ver, sourcefolder, platform)
     else:
-        if os.uname()[4].endswith("64"):
-            ver += "-64bit"
+        if platform == "linux2":
+            for p in progfiles:
+                prog = sourcefolder + "/" + p
+                output = subprocess.Popen(["file", prog],
+                        stdout=subprocess.PIPE)
+                res = output.communicate()
+                if re.findall("ELF 64-bit", res[0]):
+                    ver += "-64bit"
+                    break
+
         archive = tarball(progfiles, ver, sourcefolder)
 
     # remove temporary files