Sun Feb 5 23:15:10 UTC 2012

4 files changed, 52 insertions, 11 deletions

diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD
index b61a7a95c..94a65e428 100644
--- a/core/cloog/PKGBUILD
+++ b/core/cloog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136343 2011-08-26 22:10:53Z allan $
+# $Id: PKGBUILD 148650 2012-02-05 03:55:34Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=cloog
-pkgver=0.16.3
+pkgver=0.17.0
 pkgrel=1
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('isl' 'gmp')
 conflicts=('cloog-ppl<0.15.10-2')
 options=('!libtool')
 source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('a0f8a241cd1c4f103f8d2c91642b3498')
+md5sums=('0aa3302c81f65ca62c114e5264f8a802')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 2a0bdbb2f..17e499c1e 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $
+# $Id: PKGBUILD 148652 2012-02-05 03:55:39Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.2
-pkgrel=6
+pkgrel=7
 _snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
@@ -20,11 +20,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
-	gcc-hash-style-both.patch)
+	gcc-hash-style-both.patch
+	gcc-4.6.2-cloog-0.17.patch)
 md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
          '450772ce32daed97d7383199f8797f33'
          '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f')
+         '4df25b623799b148a0703eaeec8fdf3f'
+         '6d9939a2e667376031679ac9f9c49263')
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -46,6 +48,9 @@ build() {
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
+  # compatibility with latest cloog
+  patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
diff --git a/core/gcc/gcc-4.6.2-cloog-0.17.patch b/core/gcc/gcc-4.6.2-cloog-0.17.patch
new file mode 100644
index 000000000..0503a05ed
--- /dev/null
+++ b/core/gcc/gcc-4.6.2-cloog-0.17.patch
@@ -0,0 +1,36 @@
+diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
+--- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
++++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
+@@ -6049,8 +6049,8 @@
+     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+ 
+     if test "${cloog_org}" = yes ; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
++$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
+ if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+@@ -6061,8 +6061,7 @@
+ main ()
+ {
+ #if CLOOG_VERSION_MAJOR != 0 \
+-    || CLOOG_VERSION_MINOR != 16 \
+-    || CLOOG_VERSION_REVISION < 1
++    || CLOOG_VERSION_MINOR != 17
+     choke me
+    #endif
+   ;
+diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
+--- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
++++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
+@@ -1367,7 +1367,7 @@
+   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
+      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
+      we pass an incomplete program to cloog.  */
+-  options->language = LANGUAGE_C;
++  options->language = CLOOG_LANGUAGE_C;
+ 
+   /* Enable complex equality spreading: removes dummy statements
+      (assignments) in the generated code which repeats the
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index fc65267df..c4608bb5d 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 136341 2011-08-26 22:10:51Z allan $
+# $Id: PKGBUILD 148648 2012-02-05 03:55:32Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
-pkgver=0.07
+pkgver=0.09
 pkgrel=1
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.kotnet.org/~skimo/isl/"
 license=('LGPL2.1')
 options=('!libtool')
 source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('0d1a38db9f1c7d526758092b985827ea')
+md5sums=('6873f0b3c9f4d1fb8efae4aea53f2ab2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,5 +29,5 @@ package() {
   
   # this seems a better place for this file...
   install -dm755 $pkgdir/usr/share/gdb/auto-load/
-  mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.7.0.0-gdb.py
+  mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.9.0.0-gdb.py
 }