[arch-commits] Commit in gcc/trunk (PKGBUILD gcc-4.7.1-libada-pic.patch)

[allan at nymeria.archlinux.org]

    Date: Tuesday, January 22, 2013 @ 04:59:17
  Author: allan
Revision: 175815

upgpkg: gcc 4.7.2-4

remove pure64 patch - unneeded deviation from upstream, linker path does not matter with various lib symlinks and a simple sed keeps x86_64 libraries in /usr/lib, remove unneeded libada patch, adjust CFLAGS to minimise false positive testsuite failures

Modified:
  gcc/trunk/PKGBUILD
Deleted:
  gcc/trunk/gcc-4.7.1-libada-pic.patch

----------------------------+
 PKGBUILD                   |   13 ++++++++-----
 gcc-4.7.1-libada-pic.patch |   12 ------------
 2 files changed, 8 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-22 03:43:27 UTC (rev 175814)
+++ PKGBUILD	2013-01-22 03:59:17 UTC (rev 175815)
@@ -17,10 +17,8 @@
 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-4.7.1-libada-pic.patch
 	gcc-4.7.1-libgo-write.patch)
 md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
 
 
@@ -39,14 +37,19 @@
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
 
+  # 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 03:43:27 UTC (rev 175814)
+++ gcc-4.7.1-libada-pic.patch	2013-01-22 03:59:17 UTC (rev 175815)
@@ -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@