[arch-commits] Commit in gcc-multilib/trunk (4 files)

[Jan Steffens]

    Date: Tuesday, January 22, 2013 @ 22:52:56
  Author: heftig
Revision: 82673

4.7.2-4

Modified:
  gcc-multilib/trunk/PKGBUILD
Deleted:
  gcc-multilib/trunk/gcc-4.7.1-libada-pic.patch
  gcc-multilib/trunk/gcc-4.7.1-libgo-mksysinfo.patch
  gcc-multilib/trunk/gcc_pure64-multilib.patch

---------------------------------+
 PKGBUILD                        |   19 +++++++++----------
 gcc-4.7.1-libada-pic.patch      |   12 ------------
 gcc-4.7.1-libgo-mksysinfo.patch |   15 ---------------
 gcc_pure64-multilib.patch       |   22 ----------------------
 4 files changed, 9 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-22 20:07:30 UTC (rev 82672)
+++ PKGBUILD	2013-01-22 21:52:56 UTC (rev 82673)
@@ -8,24 +8,20 @@
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.7.2
-pkgrel=3
+pkgrel=4
 #_snapshot=4.7-20120721
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'doxygen'
+makedepends=('binutils-multilib>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'doxygen'
              'lib32-glibc>=2.17')
 checkdepends=('dejagnu')
 options=('!libtool' '!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_pure64-multilib.patch
-	gcc-4.7.1-libada-pic.patch
 	gcc-4.7.1-libgo-write.patch)
 md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
 
 
@@ -44,16 +40,19 @@
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
 
-  patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch
+  # Arch Linux installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
   patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
 
   echo ${pkgver} > gcc/BASE-VER
 
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
   cd ${srcdir}
   mkdir gcc-build && cd gcc-build
 

Deleted: gcc-4.7.1-libada-pic.patch
===================================================================
--- gcc-4.7.1-libada-pic.patch	2013-01-22 20:07:30 UTC (rev 82672)
+++ gcc-4.7.1-libada-pic.patch	2013-01-22 21:52:56 UTC (rev 82673)
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@

Deleted: gcc-4.7.1-libgo-mksysinfo.patch
===================================================================
--- gcc-4.7.1-libgo-mksysinfo.patch	2013-01-22 20:07:30 UTC (rev 82672)
+++ gcc-4.7.1-libgo-mksysinfo.patch	2013-01-22 21:52:56 UTC (rev 82673)
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`

Deleted: gcc_pure64-multilib.patch
===================================================================
--- gcc_pure64-multilib.patch	2013-01-22 20:07:30 UTC (rev 82672)
+++ gcc_pure64-multilib.patch	2013-01-22 21:52:56 UTC (rev 82673)
@@ -1,22 +0,0 @@
-diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h
---- gcc-4.7.0/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
-+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h	2012-03-24 11:52:58.926204014 +0100
-@@ -29,5 +29,5 @@
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64
---- gcc-4.7.0/gcc/config/i386/t-linux64	2011-11-02 16:23:48.000000000 +0100
-+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64	2012-03-24 11:52:44.119651885 +0100
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32