Date: Monday, November 3, 2014 @ 12:56:45
Author: allan
Revision: 121740
upgpkg: gcc-multilib 4.9.2-1
upstream update, build isl and cloog in tree
Modified:
gcc-multilib/trunk/PKGBUILD
gcc-multilib/trunk/gcc-4.8-filename-output.patch
---+
PKGBUILD | 40 ++--
gcc-4.8-filename-output.patch | 16
2 files changed, 30 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-11-03 04:26:36 UTC (rev 121739)
+++ PKGBUILD2014-11-03 11:56:45 UTC (rev 121740)
@@ -6,25 +6,29 @@
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs'
'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.9.1
+pkgver=4.9.2
_pkgver=4.9
-pkgrel=2
-_snapshot=4.9-20140903
+_islver=0.12.2
+_cloogver=0.18.1
+pkgrel=1
+#_snapshot=4.9-20140903
pkgdesc="The GNU Compiler Collection for multilib"
arch=('x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org";
-makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'gcc-ada-multilib' 'doxygen'
+makedepends=('binutils>=2.24' 'libmpc' 'gcc-ada-multilib' 'doxygen'
'lib32-glibc>=2.20')
checkdepends=('dejagnu' 'inetutils')
options=('!emptydirs')
-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
-gcc-4.8-filename-output.patch
-gcc-4.9-isl-0.13-hack.patch)
-md5sums=('24dfd67139fda4746d2deff18182611d'
- '40cb437805e2f7a006aa0d0c3098ab0f'
- 'f26ae06b9cbc8abe86f5ee4dc5737da8')
+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
+http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz
+gcc-4.8-filename-output.patch)
+md5sums=('4df8ee253b7f3863ad0b86359cd39c43'
+ 'e039bfcfb6c2ab039b8ee69bf883e824'
+ 'e34fca0540d840e5d0f6427e98c92252'
+ '6810bb9b2252f03e6c98d9a671d94589')
if [ -n "${_snapshot}" ]; then
_basedir=gcc-${_snapshot}
@@ -37,6 +41,10 @@
prepare() {
cd ${srcdir}/${_basedir}
+ # link isl/cloog for in-tree builds
+ ln -s ../isl-${_islver} isl
+ ln -s ../cloog-${_cloogver} cloog
+
# Do not run fixincludes
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -49,12 +57,9 @@
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
- patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch
+ # https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=9140d56f
+ patch -p1 -i ${srcdir}/gcc-4.8-filename-output.patch
- # isl-0.13 support - mostly header includes and a function rename
- # (which does not seem right but causes no testsuite failures...)
- patch -p1 -i ${srcdir}/gcc-4.9-isl-0.13-hack.patch
-
mkdir ${srcdir}/gcc-build
}
@@ -77,7 +82,6 @@
--disable-libstdcxx-pch --disable-libssp \
--enable-gnu-unique-object --enable-linker-build-id \
--enable-cloog-backend=isl \
- --disable-isl-version-check --disable-cloog-version-check \
--enable-lto --enable-plugin --enable-install-libiberty \
--with-linker-hash-style=gnu \
--enable-multilib --disable-werror \
@@ -183,7 +187,7 @@
package_gcc-multilib()
{
pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
- depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils>=2.24' 'libmpc'
'cloog')
+ depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils>=2.24' 'libmpc')
groups=('multilib-devel')
options=('staticlibs')
provides=("gcc=$pkgver-$pkgrel")
Modified: gcc-4.8-filename-output.patch
===
--- gcc-4.8-filename-output.patch 2014-11-03 04:26:36 UTC (rev 121739)
+++ gcc-4.8-filename-output.patch 2014-11-03 11:56:45 UTC (rev 121740)
@@ -1,12 +1,14 @@
gcc/c-family/c-opts.c (revision 200330)
-+++ gcc/c-family/c-opts.c (working copy)
-@@ -1338,10 +1338,14 @@ c_finish_options (void)
-
- /* Give CPP the next file given by -include, if any. */
+diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
+index 968b703..3f8e6e6 100644
+--- a/gcc/c-family/c-opts.c
b/gcc/c-family/c-opts.c
+@@ -1438,6 +1438,12 @@ c_finish_options (void)
static void
push_command_line_include (void)
{
-+ // This can happen if disabled by -imacros for example.
++ /* This can happen if disabled by -imacros for example.
++ Punt so that we don't set "" as the filename for
++ the header. */
+ if (include_cursor > deferred_count)
+return;
+
@@ -13,5 +15,3 @@
if (!done_preinclude)
{
done_preinc
