From 20286a8aa47524656a544f3374a07448bf645b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 10 May 2016 08:26:45 +0000
Subject: [PATCH] set ARCH variable to system architecture

---
 ChangeLog                           | 8 ++++++++
 ax_init_standard_project.m4         | 2 ++
 bootstrap.sh                        | 7 +++++++
 build-in-docker.conf                | 4 ++++
 scripts/ax_init_standard_project.m4 | 2 ++
 scripts/bootstrap.sh                | 7 +++++++
 6 files changed, 30 insertions(+)
 create mode 100644 build-in-docker.conf

diff --git a/ChangeLog b/ChangeLog
index 51542e8..14f5f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-05 10:10  
+
+	* ChangeLog, autogen.sh, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.sh, mac-create-app-bundle.sh,
+	  resolve-rpmbuilddeps.sh, scripts/ax_init_standard_project.m4,
+	  scripts/build-in-docker.sh, scripts/makefile.am: updated build
+	  system
+
 2016-04-22 08:27  
 
 	* scripts/build-in-docker.sh: basic support for centos rpm docker
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index f487c68..4128d9f 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -181,6 +181,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([AUTHOR])
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
+  ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
+  AX_SUBST(ARCH)
   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
   case "${DISTRIBUTOR// /-}" in
     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;
diff --git a/bootstrap.sh b/bootstrap.sh
index 9b53b8b..4f3b3a5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -129,6 +129,7 @@ GENERATED FILES
     * resolve-debbuilddeps.sh - script to install debian package dependencies
     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
     * build-in-docker.sh - script to build the project encapsulated in a docker container
+    * build-in-docker.conf - additional configuration for build-in-docker.sh
     * build-resource-file.sh - build resource.qrc file from a resource directory
     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
@@ -1162,6 +1163,12 @@ Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
+to build-in-docker.conf <<EOF
+repos+=("Debian|Ubuntu-precise::::::universe")
+repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+envs+=("-e 'HOME=\${HOME}'")
+dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+EOF
 
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then
diff --git a/build-in-docker.conf b/build-in-docker.conf
new file mode 100644
index 0000000..692d2fd
--- /dev/null
+++ b/build-in-docker.conf
@@ -0,0 +1,4 @@
+repos+=("Debian|Ubuntu-precise::::::universe")
+repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+envs+=("-e 'HOME=${HOME}'")
+dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index b6f64dc..dbdb0ec 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -181,6 +181,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([AUTHOR])
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
+  ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
+  AX_SUBST(ARCH)
   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
   case "${DISTRIBUTOR// /-}" in
     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ccde938..9536e49 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -129,6 +129,7 @@ GENERATED FILES
     * resolve-debbuilddeps.sh - script to install debian package dependencies
     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
     * build-in-docker.sh - script to build the project encapsulated in a docker container
+    * build-in-docker.conf - additional configuration for build-in-docker.sh
     * build-resource-file.sh - build resource.qrc file from a resource directory
     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
@@ -1162,6 +1163,12 @@ Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
+to build-in-docker.conf <<EOF
+repos+=("Debian|Ubuntu-precise::::::universe")
+repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+envs+=("-e 'HOME=\${HOME}'")
+dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+EOF
 
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then