[arch-commits] Commit in gcc/trunk (PKGBUILD gcc-4.7.0-cloog-0.17.patch)

[Allan McRae]

    Date: Sunday, July 1, 2012 @ 18:06:29
  Author: allan
Revision: 162844

upgpkg: gcc 4.7.1-3

fix build against new ppl

Modified:
  gcc/trunk/PKGBUILD
Deleted:
  gcc/trunk/gcc-4.7.0-cloog-0.17.patch

----------------------------+
 PKGBUILD                   |    8 ++------
 gcc-4.7.0-cloog-0.17.patch |   24 ------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-01 15:34:26 UTC (rev 162843)
+++ PKGBUILD	2012-07-01 22:06:29 UTC (rev 162844)
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.7.1
-pkgrel=2
+pkgrel=3
 #_snapshot=4.7-20120505
 _libstdcppmanver=20120605		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
@@ -20,13 +20,11 @@
 	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
-	gcc-4.7.0-cloog-0.17.patch
 	gcc-4.7.1-libada-pic.patch
 	gcc-4.7.1-libgo-write.patch)
 md5sums=('933e6f15f51c031060af64a9e14149ff'
          '767c62f9a047c4434f2345decf1d0819'
          'ced48436c1b3c981d721a829f1094de1'
-         '575f7d17b022e609447a590e481b18b5'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
 
@@ -50,9 +48,6 @@
     patch -p1 -i ${srcdir}/gcc_pure64.patch
   fi
 
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch
-
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
   patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
   
@@ -75,6 +70,7 @@
       --disable-libstdcxx-pch --enable-libstdcxx-time \
       --enable-gnu-unique-object --enable-linker-build-id \
       --with-ppl --enable-cloog-backend=isl \
+      --disable-ppl-version-check --disable-cloog-version-check \
       --enable-lto --enable-gold --enable-ld=default \
       --enable-plugin --with-plugin-ld=ld.gold \
       --with-linker-hash-style=gnu \

Deleted: gcc-4.7.0-cloog-0.17.patch
===================================================================
--- gcc-4.7.0-cloog-0.17.patch	2012-07-01 15:34:26 UTC (rev 162843)
+++ gcc-4.7.0-cloog-0.17.patch	2012-07-01 22:06:29 UTC (rev 162844)
@@ -1,24 +0,0 @@
-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
-   ;