From d1d3ff36a4ad82c3d35000825d268f002481da0f Mon Sep 17 00:00:00 2001
From: Johannes Ring <johannr@simula.no>
Date: Sat, 27 Jun 2015 14:29:01 +0200
Subject: [PATCH] boost: auto detect address-model (32/64 bit) unless set as
 parameter

---
 pkgs/boost/boost.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/boost/boost.yaml b/pkgs/boost/boost.yaml
index ccddd108c..19d14a60b 100644
--- a/pkgs/boost/boost.yaml
+++ b/pkgs/boost/boost.yaml
@@ -49,6 +49,15 @@ build_stages:
   bash: |
     patch -p2 < _hashdist/boost_1_55_fix_warnings.patch
 
+- name: set-address_model
+  before: bjam
+  handler: bash
+  bash: |
+    address_model={{address_model}}
+    if [ -z ${address_model} ]; then
+        address_model=$(getconf LONG_BIT)
+    fi
+
 - name: bjam
   after: bootstrap
   handler: bash
@@ -57,7 +66,7 @@ build_stages:
       echo "using mpi ;" > user-config.jam
       ./bjam -q \
              toolset={{toolset}} \
-             address-model={{address_model}} \
+             address-model=${address_model} \
              -j ${HASHDIST_CPU_COUNT} \
              --user-config=user-config.jam \
              --build-dir=_build\
@@ -75,7 +84,7 @@ build_stages:
     bash: |
       ./bjam -q \
              toolset={{toolset}} \
-             address-model={{address_model}} \
+             address-model=${address_model} \
              -j ${HASHDIST_CPU_COUNT} \
              --without-context \
              --without-coroutine \