[arch-commits] CVS update of extra/system/gcc3 (PKGBUILD gcc-localeversion.patch)

[Tobias Powalowski]

    Date: Monday, July 9, 2007 @ 18:27:15
  Author: tpowa
    Path: /home/cvs-extra/extra/system/gcc3

Modified: PKGBUILD (1.1 -> 1.2) gcc-localeversion.patch (1.1 -> 1.2)

'upgpkg: added to repo for qemu building'


-------------------------+
 PKGBUILD                |   24 +++++++++++++-----------
 gcc-localeversion.patch |    6 +++---
 2 files changed, 16 insertions(+), 14 deletions(-)


Index: extra/system/gcc3/PKGBUILD
diff -u extra/system/gcc3/PKGBUILD:1.1 extra/system/gcc3/PKGBUILD:1.2
--- extra/system/gcc3/PKGBUILD:1.1	Wed Feb  7 13:11:23 2007
+++ extra/system/gcc3/PKGBUILD	Mon Jul  9 18:27:15 2007
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD,v 1.1 2007/02/07 18:11:23 thomas Exp $
+# $Id: PKGBUILD,v 1.2 2007/07/09 22:27:15 tpowa Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
-pkgname=gcc3
-pkgver=3.3.6
-pkgrel=3
+pkgname=gcc34
+pkgver=3.4.6
+pkgrel=1
 #_snapshot=4.1-20060519
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
 url="http://gcc.gnu.org"
 depends=('libstdc++5' 'gcc')
-options=('nolibtool')
+options=('!libtool')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 \
 	gcc-localeversion.patch gcc-3.3-pure64.patch)
-md5sums=('18c52e6fb8966b7700665dca289d077f' '6b3d00b8d079805be1b895f7f6ce47a0'\
-         'edfe85cad727b75549fa5f8e5ac77a41' 'eb834abd7620a5f11492ee2c243b8346')
- 
+
 build() {
   export MAKEFLAGS="-j1"
+  # use "defaults" CFLAGS and CXXFLAGS
+  export CFLAGS="-march=i686 -O2 -pipe"
+  export CXXFLAGS="-march=i686 -O2 -pipe"
+
   cd ${startdir}/src/gcc-${pkgver}
 
   patch -Np0 -i ${startdir}/src/gcc-localeversion.patch || return 1
@@ -34,7 +36,7 @@
   ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
       --enable-languages=c,c++ --enable-threads=posix \
       --enable-__cxa_atexit  --disable-multilib --libdir=/usr/lib \
-      --enable-clocale=gnu --program-suffix=-3.3
+      --enable-clocale=gnu --program-suffix=-3.4
 
   make bootstrap || return 1
   make DESTDIR=${startdir}/pkg install || return 1
@@ -42,6 +44,6 @@
   rm -f ${startdir}/pkg/usr/lib/lib{stdc++,supc++,gcc_s}.*
   rm -f ${startdir}/pkg/usr/share/locale/*/LC_MESSAGES/libstdc++.mo
   rm -rf ${startdir}/pkg/usr/man/man7
-  mv ${startdir}/pkg/usr/man/man1/cpp.1 ${startdir}/pkg/usr/man/man1/cpp-3.3.1
-  mv ${startdir}/pkg/usr/man/man1/gcov.1 ${startdir}/pkg/usr/man/man1/gcov-3.3.1
+  #mv ${startdir}/pkg/usr/man/man1/cpp.1 ${startdir}/pkg/usr/man/man1/cpp-3.4.1
+  #mv ${startdir}/pkg/usr/man/man1/gcov.1 ${startdir}/pkg/usr/man/man1/gcov-3.4.1
 }
Index: extra/system/gcc3/gcc-localeversion.patch
diff -u extra/system/gcc3/gcc-localeversion.patch:1.1 extra/system/gcc3/gcc-localeversion.patch:1.2
--- extra/system/gcc3/gcc-localeversion.patch:1.1	Wed Feb  7 13:11:23 2007
+++ extra/system/gcc3/gcc-localeversion.patch	Mon Jul  9 18:27:15 2007
@@ -24,11 +24,11 @@
 @@ -2479,6 +2480,7 @@
  # Remake the info files.
  
- docdir = $(srcdir)/doc
+ doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
 +iv := -$(shell echo $(version) | awk -F. '{printf "%s.%s",$$1,$$2}')
  
- doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
- info: $(docdir)/cpp.info $(docdir)/gcc.info $(docdir)/gccint.info $(docdir)/gccinstall.info lang.info $(docdir)/cppinternals.info
+ INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \
+             doc/gccinstall.info doc/cppinternals.info
 @@ -3694,7 +3696,7 @@
  GMSGFMT = @GMSGFMT@
  MSGMERGE = msgmerge