[arch-commits] Commit in gcc/trunk (PKGBUILD gcc-hash-style-both.patch gcc.install)

Allan McRae allan at archlinux.org
Wed Apr 22 11:40:37 EDT 2009


    Date: Wednesday, April 22, 2009 @ 11:40:37
  Author: allan
Revision: 36445

upgpkg: gcc 4.4.0-1
    upstream update, new deps - ppl and cloog-ppl, remove unneeded bison build patch, remove treelang (removed upstream), update libstdc++ man pages, install license exception, compress info pages

Modified:
  gcc/trunk/PKGBUILD
  gcc/trunk/gcc-hash-style-both.patch
  gcc/trunk/gcc.install

---------------------------+
 PKGBUILD                  |   54 ++++++++++++++++++++++++--------------------
 gcc-hash-style-both.patch |   12 ++++-----
 gcc.install               |    8 ++++--
 3 files changed, 41 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-22 14:23:20 UTC (rev 36444)
+++ PKGBUILD	2009-04-22 15:40:37 UTC (rev 36445)
@@ -1,36 +1,36 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 
+# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
+
 pkgname=gcc
-pkgver=4.3.3
+pkgver=4.4.0
 pkgrel=1
-#_snapshot=4.3-20080724
+#_snapshot=4.4.0-RC-20090414
+_libstdcppmanver=20090406
 pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'custom')
 groups=('base-devel')
 url="http://gcc.gnu.org"
-depends=('binutils>=2.19' "gcc-libs>=${pkgver}" 'mpfr>=2.3.1' 'texinfo')
+depends=('binutils>=2.19' "gcc-libs>=${pkgver}" 'mpfr>=2.3.1' 'cloog-ppl>=0.15.3')
 makedepends=('flex')
 replaces=('gcc-fortran' 'gcc-objc')
 options=('!libtool')
 install=gcc.install
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,java}-${pkgver}.tar.bz2
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,java}-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-20080118.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc}-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc}-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
-	gcc-hash-style-both.patch
-	buildfix_new_bison.patch)
-md5sums=('1739288c2c7b1472796b33d641dbdbbd'
-         '18428e313a9927d38b313e688c62219b'
-         '8771e6190dd4f3178b2a7978d2380a5d'
-         '125b75947c763ba59b7ea95d3739d431'
-         '068938366ee0be5b70112bdf485898b4'
-         '990881456a89b1ffbd68d2d7188759da'
+	gcc-hash-style-both.patch)
+md5sums=('c7e65c47fa94541f7f6cd0cf3d9c850b'
+         '687cceaed97c4145281b6418c9b16847'
+         '68f33643cbece51f9a04844a6c6b94c3'
+         '74b40bb4ab4532b34258293daf6b63f9'
+         '96438846668ec45e3f3d471edb436967'
          '4030ee1c08dd1e843c0225b772360e76'
-         'bb420bc84b1104455b7230b1cd4b96c2'
-         '412fb8ebb30958eb1a93e9bd89413dd7')
+         '6fd395bacbd7b6e47c7b74854b478363')
 
 build() {
   if ! locale -a | grep ^de_DE; then
@@ -47,28 +47,30 @@
     patch -Np1 -i ../gcc_pure64.patch || return 1
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1
-  patch -Np0 -i ${srcdir}/buildfix_new_bison.patch || return 1
 
   echo ${pkgver} > gcc/BASE-VER
 
   mkdir build
   cd build
   ../configure --prefix=/usr --enable-shared \
-      --enable-languages=c,c++,fortran,objc,obj-c++,treelang \
+      --enable-languages=c,c++,fortran,objc,obj-c++ \
       --enable-threads=posix --mandir=/usr/share/man --infodir=/usr/share/info \
       --enable-__cxa_atexit  --disable-multilib --libdir=/usr/lib \
       --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \
       --with-tune=generic
   make || return 1
   make -j1 DESTDIR=${pkgdir} install || return 1
-  mkdir -p ${pkgdir}/lib
+  install -dm755 ${pkgdir}/lib
   ln -sf ../usr/bin/cpp ${pkgdir}/lib/cpp
   ln -sf gcc ${pkgdir}/usr/bin/cc
   ln -sf g++ ${pkgdir}/usr/bin/c++
 
   # install the libstdc++ man pages
-  mkdir -p ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+  install -dm755 ${pkgdir}/usr/share/man/man3
+  install -m644 ${srcdir}/libstdc++-man.${_libstdcppmanver}/man3/* \
+    ${pkgdir}/usr/share/man/man3/
+  # deal with conflicts...
+  rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3
 
   # Remove libraries and translations in gcc-libs
   rm -f ${pkgdir}/usr/lib/lib*
@@ -77,5 +79,9 @@
   # Remove fixed includes, either no need for them, or they're not complete
   rm -rf ${pkgdir}/usr/lib/${CHOST}/${pkgver}/include-fixed/*
 
+  # Install Runtime Library Exception
+  install -Dm644 ../COPYING.RUNTIME ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+
   rm -f ${pkgdir}/usr/share/info/dir
+  gzip -9 ${pkgdir}/usr/share/info/*
 }

Modified: gcc-hash-style-both.patch
===================================================================
--- gcc-hash-style-both.patch	2009-04-22 14:23:20 UTC (rev 36444)
+++ gcc-hash-style-both.patch	2009-04-22 15:40:37 UTC (rev 36445)
@@ -78,8 +78,8 @@
    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
    { "link_arch",	 LINK_ARCH_SPEC },
  
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
@@ -87,8 +87,8 @@
          %{static:-static}}} \
  "
  
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
@@ -96,8 +96,8 @@
  #else /* !SPARC_BI_ARCH */
  
  #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \

Modified: gcc.install
===================================================================
--- gcc.install	2009-04-22 14:23:20 UTC (rev 36444)
+++ gcc.install	2009-04-22 15:40:37 UTC (rev 36445)
@@ -1,9 +1,10 @@
 infodir=/usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info gfortran.info libgomp.info treelang.info)
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info gfortran.info libgomp.info)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -12,8 +13,9 @@
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 



More information about the arch-commits mailing list