From c2f35c0d2948a99314e7ad17ebfebab7c06089b4 Mon Sep 17 00:00:00 2001
From: dev <dev@robertfoss.se>
Date: Thu, 5 May 2016 22:32:20 +0000
Subject: [PATCH] core/buildscripts: Added proper uname based BITS detection.
Added automatic detection for the BITS variable.
---
core/c/jbigi/build_jbigi.sh | 12 +++++++++++-
core/c/jbigi/mbuild-all.sh | 14 +++++++++++++-
core/c/jcpuid/build.sh | 14 +++++++++++++-
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
index 61b2fb82eb..f2c042ef03 100755
--- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh
@@ -5,7 +5,17 @@
[ -z "$CC" ] && CC="gcc"
if [ -z $BITS ]; then
- BITS=64
+ if [[ $(uname -a) =~ "x86_64" ]]; then
+ BITS=64
+ elif [[ $(uname -a) =~ "i386" ]]; then
+ BITS=32
+ elif [[ $(uname -a) =~ "i686" ]]; then
+ BITS=32
+ else
+ echo "Unable to detect default setting for BITS variable"
+ exit
+ fi
+
printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
fi
diff --git a/core/c/jbigi/mbuild-all.sh b/core/c/jbigi/mbuild-all.sh
index e74f29c00d..5099b578d2 100755
--- a/core/c/jbigi/mbuild-all.sh
+++ b/core/c/jbigi/mbuild-all.sh
@@ -86,10 +86,22 @@ fi
if [ -z $BITS ]; then
- BITS=32
+ UNAME="$(uname -a)"
+ if test "${UNAME#*x86_64}" != "x86_&4"; then
+ BITS=64
+ elif test "${UNAME#*i386}" != "i386"; then
+ BITS=32
+ elif test "${UNAME#*i686}" != "i686"; then
+ BITS=32
+ else
+ echo "Unable to detect default setting for BITS variable"
+ exit
+ fi
+
printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
fi
+
if [ -z $CC ]; then
export CC="gcc"
printf "\aCC variable not set, defaulting to $CC\n\a" >&2
diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
index cb9a7e5000..63dacb55e9 100755
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
@@ -24,10 +24,22 @@ esac
if [ -z $BITS ]; then
- BITS=64
+ UNAME="$(uname -a)"
+ if test "${UNAME#*x86_64}" != "x86_&4"; then
+ BITS=64
+ elif test "${UNAME#*i386}" != "i386"; then
+ BITS=32
+ elif test "${UNAME#*i686}" != "i686"; then
+ BITS=32
+ else
+ echo "Unable to detect default setting for BITS variable"
+ exit
+ fi
+
printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
fi
+
if [ -z $CC ]; then
export CC="gcc"
printf "\aCC variable not set, defaulting to $CC\n\a" >&2
--
GitLab