From f0d54c69a71d7d5cb32aa342ea38cba6aab9570f Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Tue, 23 Sep 2014 22:00:10 -0400
Subject: [PATCH] Add isl

---
 config/packages-list   | 1 +
 stage0/hv-install-2    | 4 ++++
 stage0/packages-update | 1 +
 stage0/pkg/gcc         | 2 +-
 stage1/hv-install-2    | 1 +
 stage1/packages-update | 1 +
 stage1/pkg/gcc         | 2 +-
 stage2/hv-install-1    | 1 +
 stage2/packages-update | 1 +
 9 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 95789fd..5a5ae3c 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -180,6 +180,7 @@ INTLTOOL="intltool-0.50.2"
 IPROUTE2="iproute2-3.3.0"
 IPTABLES="iptables-1.4.15"
 ISO_CODES="iso-codes-3.38"
+ISL="isl-0.12.2"
 ITSTOOL="itstool-2.0.2"
 
 JACK="jack-audio-connection-kit-0.121.3"
diff --git a/stage0/hv-install-2 b/stage0/hv-install-2
index ef76fbd..c7ee293 100755
--- a/stage0/hv-install-2
+++ b/stage0/hv-install-2
@@ -33,6 +33,10 @@ ipkg ${MPC} "\
     --with-gmp=/cross-tools \
     --with-mpfr=/cross-tools"
 
+ipkg ${ISL} "\
+    --disable-static \
+    --with-gmp-prefix=/cross-tools"
+
 ipkg ${CLOOG} "\
     --enable-shared \
     --disable-static \
diff --git a/stage0/packages-update b/stage0/packages-update
index f3d668d..5951e96 100755
--- a/stage0/packages-update
+++ b/stage0/packages-update
@@ -23,6 +23,7 @@ fpkg -m gnu ${NCURSES}
 fpkg -m gnu ${GMP}
 fpkg -m gnu ${MPFR}
 fpkg -e "tar.gz" ${MPC} "http://www.multiprecision.org/mpc/download"
+fpkg ${ISL} "http://isl.gforge.inria.fr"
 fpkg -e "tar.gz" ${CLOOG} "http://www.bastoul.net/cloog/pages/download"
 fpkg -e "tar.bz2" -m gnu ${BINUTILS}
 fpkg -m gnu -s "gcc/${GCC}" ${GCC}
diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index 0fd6795..c2717d0 100644
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -15,8 +15,8 @@ hvconfig_pre()
         --disable-nls \
         --with-mpfr=/cross-tools \
         --with-gmp=/cross-tools \
+        --with-isl=/cross-tools \
         --with-cloog=/cross-tools \
-        --enable-cloog-backend=isl \
         --disable-multilib"
 
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index cc51073..b60c8a7 100755
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -12,6 +12,7 @@ HOST_CC=gcc CPPFLAGS=-fexceptions \
     ipkg ${GMP} "--enable-cxx"
 ipkg ${MPFR} "--enable-shared"
 ipkg ${MPC}
+ipkg ${ISL}
 ipkg ${CLOOG} "\
     --enable-shared \
     --with-gmp=/tools"
diff --git a/stage1/packages-update b/stage1/packages-update
index 1fec25d..f8e3ffe 100755
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -12,6 +12,7 @@ update_packages_init ${*}
 lpkg 0 ${GMP}
 lpkg 0 ${MPFR}
 lpkg 0 ${MPC}
+lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc
index 06f70f5..11a2837 100644
--- a/stage1/pkg/gcc
+++ b/stage1/pkg/gcc
@@ -34,7 +34,7 @@ hvconfig_post()
 {
     # Prevent GCC from looking in the wrong directories for headers and
     # libraries:
-    sed -e "/^HOST_\(GMP\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
+    sed -e "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::"\
         -i Makefile
 }
 
diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 61e6138..6781371 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -23,6 +23,7 @@ CPPFLAGS=-fexceptions \
     ipkg ${GMP} "--enable-cxx --enable-mpbsd"
 ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
 ipkg ${MPC}
+ipkg ${ISL}
 ipkg ${CLOOG} "--enable-shared"
 
 unset CC
diff --git a/stage2/packages-update b/stage2/packages-update
index d478a2b..7bb8a8a 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -14,6 +14,7 @@ lpkg 0 ${GLIBC}
 lpkg 0 ${GMP}
 lpkg 0 ${MPFR}
 lpkg 0 ${MPC}
+lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
-- 
2.20.1