[arch-commits] Commit in gcc3/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 12, 2008 @ 11:11:11
  Author: jgc
Revision: 15091

Merged revisions 356,2310,15090 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gcc3/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2310 | paul | 2008-05-31 17:15:19 +0200 (Sat, 31 May 2008) | 2 lines
  
  Added more licenses.
........
  r15090 | jgc | 2008-10-12 17:10:32 +0200 (Sun, 12 Oct 2008) | 2 lines
  
  upgpkg: gcc3 3.3.6-4
      Fix dependencies, manpath, infopath
........

Added:
  gcc3/repos/extra-i686/gcc.install
    (from rev 15090, gcc3/trunk/gcc.install)
Modified:
  gcc3/repos/extra-i686/	(properties)
  gcc3/repos/extra-i686/PKGBUILD

-------------+
 PKGBUILD    |   51 +++++++++++++++++++++++++++++++--------------------
 gcc.install |   18 ++++++++++++++++++
 2 files changed, 49 insertions(+), 20 deletions(-)


Property changes on: gcc3/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gcc3/trunk:1
   + /gcc3/trunk:1-15090

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-12 15:10:32 UTC (rev 15090)
+++ extra-i686/PKGBUILD	2008-10-12 15:11:11 UTC (rev 15091)
@@ -2,26 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gcc3
 pkgver=3.3.6
-pkgrel=3
-#_snapshot=4.1-20060519
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 arch=(i686 x86_64)
 url="http://gcc.gnu.org"
-depends=('libstdc++5' 'gcc')
-options=('nolibtool')
-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')
+license=('GPL') # with exception, per fsf.org
+depends=('libstdc++5' 'gcc-libs' 'texinfo')
+options=('!libtool' '!makeflags')
+install=gcc.install
+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"
-  cd ${startdir}/src/gcc-${pkgver}
+  cd "${srcdir}/gcc-${pkgver}"
+  patch -Np0 -i "${srcdir}/gcc-localeversion.patch" || return 1
 
-  patch -Np0 -i ${startdir}/src/gcc-localeversion.patch || return 1
-
   if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 -i ../gcc-3.3-pure64.patch || return 1
+    patch -Np1 -i "${srcdir}/gcc-3.3-pure64.patch" || return 1
   fi
 
   # Don't run fixincludes
@@ -29,19 +31,28 @@
   # Don't install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
+  export CFLAGS="${CFLAGS/-mtune=generic/}"
+  export CXXFLAGS="${CXXFLAGS/-mtune=generic/}"
+
   mkdir ../gcc-build
   cd ../gcc-build
   ../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.3 --mandir=/usr/share/man \
+      --infodir=/usr/share/info
 
   make bootstrap || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  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
+  rm -f ${pkgdir}/usr/lib/lib{stdc++,supc++,gcc_s}.*
+  rm -f ${pkgdir}/usr/share/locale/*/LC_MESSAGES/libstdc++.mo
+  rm -rf "${pkgdir}/usr/share/man/man7"
+  mv "${pkgdir}/usr/share/man/man1/cpp.1" "${pkgdir}/usr/share/man/man1/cpp-3.3.1" || return 1
+  mv "${pkgdir}/usr/share/man/man1/gcov.1" "${pkgdir}/usr/share/man/man1/gcov-3.3.1" || return 1
+
+  for inf in cpp cppinternals gcc gccint; do
+    mv ${pkgdir}/usr/share/info/${inf}.info ${pkgdir}/usr/share/info/${inf}-3.3.info
+    gzip -9 ${pkgdir}/usr/share/info/${inf}-3.3.info
+  done
 }

Copied: gcc3/repos/extra-i686/gcc.install (from rev 15090, gcc3/trunk/gcc.install)
===================================================================
--- extra-i686/gcc.install	                        (rev 0)
+++ extra-i686/gcc.install	2008-10-12 15:11:11 UTC (rev 15091)
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(cpp-3.3.info cppinternals-3.3.info gcc-3.3.info gccint-3.3.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info ${infodir}/${file}.gz ${infodir}/dir > /dev/null 2>&1
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete ${infodir}/${file}.gz ${infodir}/dir > /dev/null 2>&1
+  done
+}