aboutsummaryrefslogtreecommitdiff
path: root/resources/scripts/helpers/build/dependencies/trisquel7
diff options
context:
space:
mode:
authorKlemens Nanni <contact@autoboot.org>2016-03-09 14:09:04 +0100
committerFrancis Rowe <info@gluglug.org.uk>2016-03-11 01:08:22 +0000
commitc64485ec850ca901f1c7adde48e19bb84397e591 (patch)
treeabd812ce9e342ec255256ac6faaf580381604391 /resources/scripts/helpers/build/dependencies/trisquel7
parente15beed400f3ced1ba2c60fb78232de177a05e30 (diff)
downloadlibrebootfr-c64485ec850ca901f1c7adde48e19bb84397e591.tar.gz
librebootfr-c64485ec850ca901f1c7adde48e19bb84397e591.zip
build/dependencies: Check architecture only once
Diffstat (limited to 'resources/scripts/helpers/build/dependencies/trisquel7')
-rwxr-xr-xresources/scripts/helpers/build/dependencies/trisquel724
1 files changed, 10 insertions, 14 deletions
diff --git a/resources/scripts/helpers/build/dependencies/trisquel7 b/resources/scripts/helpers/build/dependencies/trisquel7
index 04b931de..f379e049 100755
--- a/resources/scripts/helpers/build/dependencies/trisquel7
+++ b/resources/scripts/helpers/build/dependencies/trisquel7
@@ -51,13 +51,15 @@ apt-get -y install build-essential
# for cross-compiling ARM binaries
apt-get -y install gcc-arm-linux-gnueabi
+[ "$(uname -i)" = x86_64 ] || [ "$(uname -m)" = x86_64 ]
+arch=${?}
+
# For cross-compiling i686 target on x86_64 host.
-if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ]
- then
- apt-get -y install gcc-multilib libc6-i386 libc6-dev-i386
- apt-get -y install lib32stdc++6 g++-multilib dh-autoreconf
- # recommended, but not sure what for:
- apt-get -y install lib32tinfo-dev texi2html
+if [ "${arch}" -eq 0 ]; then
+ apt-get -y install gcc-multilib libc6-i386 libc6-dev-i386
+ apt-get -y install lib32stdc++6 g++-multilib dh-autoreconf
+ # recommended, but not sure what for:
+ apt-get -y install lib32tinfo-dev texi2html
fi
# Memtest86+ build dependencies
@@ -76,10 +78,7 @@ apt-get -y install build-essential
apt-get -y install libncurses5-dev doxygen iasl gdb flex bison build-essential git libssl-dev
# For cross-compiling i686 target on x86_64 host.
-if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ]
- then
- apt-get -y install lib32ncurses5-dev
-fi
+[ "${arch}" -eq 0 ] && apt-get -y install lib32ncurses5-dev
# GRUB build dependencies (also requires build-essential, bison and flex)
# ------------------------------------------------------------
@@ -97,7 +96,4 @@ apt-get -y install build-essential
apt-get -y install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential
# For cross-compiling i686 target on x86_64 host.
-if [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ]
- then
- apt-get -y install lib32z1-dev
-fi
+[ "${arch}" -eq 0 ] && apt-get -y install lib32z1-dev