From 60b4c78a8b30052cd630291b5f1d54b787c9e242 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 24 Nov 2014 17:46:40 +0000
Subject: deps-trisquel: Make GRUB build on in Trisquel 7 x86_64

Add the dependencies for multilib/lib32 (cross compiling).
Fixes building GRUB and probably more.
---
 deps-trisquel | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'deps-trisquel')

diff --git a/deps-trisquel b/deps-trisquel
index 4d886a3..519292f 100755
--- a/deps-trisquel
+++ b/deps-trisquel
@@ -45,6 +45,15 @@ apt-get -y install subversion git
 
 apt-get -y install 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 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
 # ------------------------------------------------------------
 
@@ -70,6 +79,12 @@ apt-get -y install build-essential
 
 apt-get -y install libncurses5-dev doxygen iasl gdb flex bison build-essential git
 
+# 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
+
 # GRUB build dependencies (also requires build-essential, bison and flex)
 # ------------------------------------------------------------
 
@@ -92,5 +107,11 @@ apt-get -y install build-essential
 
 apt-get -y install libpci-dev pciutils zlib1g-dev libftdi-dev build-essential subversion
 
+# 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
+
 # ------------------- DONE ----------------------
 
-- 
cgit v1.2.3-54-g00ecf