From 55f65bce71249e10f80dbfc88a781b3d63d267d8 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 8 May 2015 15:52:59 +0200
Subject: [PATCH] Pass -m64 down to autobuild during "box" step, or the wrong
 packages end up in the resulting .txt-file.

---
 indra/cmake/BuildPackagesInfo.cmake | 8 +++++++-
 scripts/packages-formatter.py       | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake
index 0f574ee39a..3893762917 100644
--- a/indra/cmake/BuildPackagesInfo.cmake
+++ b/indra/cmake/BuildPackagesInfo.cmake
@@ -2,9 +2,15 @@
 # Construct the version and copyright information based on package data.
 include(Python)
 
+if( ND_BUILD64BIT_ARCH )
+  set( ND_PKG_FLAGS "-m64" )
+else( ND_BUILD64BIT_ARCH )
+  set( ND_PKG_FLAGS "" )
+endif( ND_BUILD64BIT_ARCH )
+
 add_custom_command(OUTPUT packages-info.txt
   COMMENT Generating packages-info.txt for the about box
   MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
   DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
-  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt
+  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py ${ND_PKG_FLAGS} > packages-info.txt
   )
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 6cd662af17..64330b24e8 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -57,6 +57,11 @@ def autobuild(*args):
     # no exceptions yet, let caller read stdout
     return child.stdout
 
+# <FS:ND> Pass -m64 down to autobuild if needed
+if len( sys.argv ) > 1 and sys.argv[1] == "-m64":
+    os.environ[ "ND_AUTOBUILD_ARCH" ] = "x64"
+# </FS:ND>
+    
 version={}
 versions=autobuild('install', '--versions')
 for line in versions: