Update to cloog-0.18.2

diff --git a/config/packages-list b/config/packages-list
index 5a5ae3c7d46eab586d717477ab9df601cc9f6f66..f1f105ab315bff0036635a572181e06d4f723ce0 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -42,7 +42,7 @@ CELESTIA="celestia-1.6.1"
 CKERMIT="ckermit-8.0.211"
 CHORDPACK="chordpack-0.8.2"
 CLAMAV="clamav-0.97.5"
-CLOOG="cloog-0.16.3"
+CLOOG="cloog-0.18.2"
 CMAKE="cmake-2.8.10"
 COLORDIFF="colordiff-1.0.10"
 COREUTILS="coreutils-8.21"

diff --git a/stage0/hv-install-2 b/stage0/hv-install-2
index c7ee29339c818138fb12a58e8c58f8cab7c5daa3..158e4ce3aa11e5a2d0903c554498d172dab5a524 100755 (executable)
--- a/stage0/hv-install-2
+++ b/stage0/hv-install-2
@@ -38,7 +38,6 @@ ipkg ${ISL} "\
     --with-gmp-prefix=/cross-tools"
 
 ipkg ${CLOOG} "\
-    --enable-shared \
     --disable-static \
     --with-bits=gmp \
     --with-gmp-prefix=/cross-tools"

diff --git a/stage0/pkg/cloog b/stage0/pkg/cloog
index eb2de0dfd003cf75d9f89f05efe360b644fac134..8e278d25c8a09a155973a9d27228cf54eeecaab4 100644 (file)
--- a/stage0/pkg/cloog
+++ b/stage0/pkg/cloog
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-hvconfig_pre()
+hvconfig_post()
 {
-    # Prevents the configure script from setting LD_LIBRARY_PATH when it finds
-    # PPL. This will prevent any conflicts with libraries from the host system.
-    sed -e "/LD_LIBRARY_PATH=/d" -i ${LFS_TMP}/${PACKAGE}/configure
+    # Apply a sed which prevents the attempted installation of an invalid file:
+    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
 }

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index b60c8a798b4339b9aac9dd77e3ef90f2182d9714..89929ce8817c1b9183168737a4ab5005b5869f2d 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -14,8 +14,7 @@ ipkg ${MPFR} "--enable-shared"
 ipkg ${MPC}
 ipkg ${ISL}
 ipkg ${CLOOG} "\
-    --enable-shared \
-    --with-gmp=/tools"
+    --with-isl=system"
 ipkg -m acnb ${ZLIB}
 ipkg ${BINUTILS}
 ipkg ${GCC}

diff --git a/stage1/pkg/cloog b/stage1/pkg/cloog
index 7b745ad24fb93cffbca9f77e28d658860ebfb6fb..8e278d25c8a09a155973a9d27228cf54eeecaab4 100644 (file)
--- a/stage1/pkg/cloog
+++ b/stage1/pkg/cloog
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# Prevents the configure script from setting LD_LIBRARY_PATH when it finds PPL.
-# This will prevent any conflicts with libraries from the host system.
-hvconfig_pre()
+hvconfig_post()
 {
-    sed -e "/LD_LIBRARY_PATH=/d" -i ${LFS_TMP}/${PACKAGE}/configure
+    # Apply a sed which prevents the attempted installation of an invalid file:
+    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
 }

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 678137137e2d28caa95660a57cbe57a8625fc673..18de02bf7ee5edeef1c1fde83f046f3452f1dc31 100755 (executable)
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -24,7 +24,7 @@ CPPFLAGS=-fexceptions \
 ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
 ipkg ${MPC}
 ipkg ${ISL}
-ipkg ${CLOOG} "--enable-shared"
+ipkg ${CLOOG} "--with-isl=system"
 
 unset CC
 unset CXX

diff --git a/stage2/pkg/cloog b/stage2/pkg/cloog
new file mode 100644 (file)
index 0000000..8e278d2
--- /dev/null
+++ b/stage2/pkg/cloog
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+hvconfig_post()
+{
+    # Apply a sed which prevents the attempted installation of an invalid file:
+    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
+}