From a7cbd7d91232e4eba1771153f5fb2793628a2c20 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 1 Jul 2012 17:27:32 +0200 Subject: [PATCH] gcc: rebuild against new ppl and cloog, enable ISL backend. --- srcpkgs/gcc/gcc-c++.rshlibs | 4 ++-- srcpkgs/gcc/gcc-fortran.rshlibs | 4 ++-- srcpkgs/gcc/gcc-go.rshlibs | 4 ++-- srcpkgs/gcc/gcc-objc++.rshlibs | 4 ++-- srcpkgs/gcc/gcc-objc.rshlibs | 4 ++-- srcpkgs/gcc/gcc.rshlibs | 4 ++-- .../gcc/patches/gcc-4.7.0-cloog-0.17.patch | 23 +++++++++++++++++++ .../gcc/patches/gcc-4.7.1-libgo-write.patch | 11 +++++++++ srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch | 11 +++++++++ srcpkgs/gcc/template | 6 +++-- 10 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch create mode 100644 srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch create mode 100644 srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch diff --git a/srcpkgs/gcc/gcc-c++.rshlibs b/srcpkgs/gcc/gcc-c++.rshlibs index 0167f35af9c..d716e33d84d 100644 --- a/srcpkgs/gcc/gcc-c++.rshlibs +++ b/srcpkgs/gcc/gcc-c++.rshlibs @@ -1,8 +1,8 @@ libc.so.6 -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 libdl.so.2 libz.so.1 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/gcc-fortran.rshlibs b/srcpkgs/gcc/gcc-fortran.rshlibs index 0167f35af9c..d716e33d84d 100644 --- a/srcpkgs/gcc/gcc-fortran.rshlibs +++ b/srcpkgs/gcc/gcc-fortran.rshlibs @@ -1,8 +1,8 @@ libc.so.6 -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 libdl.so.2 libz.so.1 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/gcc-go.rshlibs b/srcpkgs/gcc/gcc-go.rshlibs index 4d3a7e9eaee..ec894ee9dcb 100644 --- a/srcpkgs/gcc/gcc-go.rshlibs +++ b/srcpkgs/gcc/gcc-go.rshlibs @@ -1,6 +1,4 @@ libc.so.6 -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 @@ -9,3 +7,5 @@ libz.so.1 libstdc++.so.6 libm.so.6 libgcc_s.so.1 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/gcc-objc++.rshlibs b/srcpkgs/gcc/gcc-objc++.rshlibs index b94b7d60995..f54780e243d 100644 --- a/srcpkgs/gcc/gcc-objc++.rshlibs +++ b/srcpkgs/gcc/gcc-objc++.rshlibs @@ -1,8 +1,8 @@ -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 libdl.so.2 libz.so.1 libc.so.6 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/gcc-objc.rshlibs b/srcpkgs/gcc/gcc-objc.rshlibs index b94b7d60995..f54780e243d 100644 --- a/srcpkgs/gcc/gcc-objc.rshlibs +++ b/srcpkgs/gcc/gcc-objc.rshlibs @@ -1,8 +1,8 @@ -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 libdl.so.2 libz.so.1 libc.so.6 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/gcc.rshlibs b/srcpkgs/gcc/gcc.rshlibs index 0167f35af9c..d716e33d84d 100644 --- a/srcpkgs/gcc/gcc.rshlibs +++ b/srcpkgs/gcc/gcc.rshlibs @@ -1,8 +1,8 @@ libc.so.6 -libcloog.so.0 -libppl_c.so.4 libmpc.so.2 libmpfr.so.4 libgmp.so.10 libdl.so.2 libz.so.1 +libcloog-isl.so.3 +libppl_c.so.4 diff --git a/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch b/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch new file mode 100644 index 00000000000..48882ef0a34 --- /dev/null +++ b/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch @@ -0,0 +1,23 @@ +--- configure 2011-12-18 20:03:44.000000000 +1000 ++++ 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 --git a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch new file mode 100644 index 00000000000..e5e8e8cef84 --- /dev/null +++ b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-write.patch @@ -0,0 +1,11 @@ +--- libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 ++++ libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 +@@ -17,7 +17,8 @@ + G* g = runtime_g(); + + if(g == nil || g->writebuf == nil) { +- runtime_write(2, v, n); ++ ssize_t bytesWritten = runtime_write(2, v, n); ++ (void)bytesWritten; + return; + } diff --git a/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch b/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch new file mode 100644 index 00000000000..5bb65bdf231 --- /dev/null +++ b/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch @@ -0,0 +1,11 @@ +--- configure.orig 2012-07-01 17:01:26.754771029 +0200 ++++ configure 2012-07-01 17:02:05.402843729 +0200 +@@ -5690,7 +5690,7 @@ int + main () + { + +- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 ++ #if PPL_VERSION_MAJOR > 2 || PPL_VERSION_MINOR > 20 + choke me + #endif + diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 8aa9531a89e..5c054510e1d 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -2,10 +2,11 @@ pkgname=gcc _majorver=4.7 version=${_majorver}.1 -revision=1 +revision=2 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" -makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel cloog-ppl-devel libelf-devel" +makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel +ppl-devel>=1.0 cloog-devel libelf-devel" short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -51,6 +52,7 @@ do_configure() { --disable-rpath --with-system-zlib --enable-shared --enable-lto \ --enable-linker-build-id --enable-gnu-unique-object \ --enable-checking=release --disable-libstdcxx-pch \ + --with-ppl --enable-cloog-backend=isl --enable-libstdcxx-time \ ${CONFIGURE_SHARED_ARGS} }