[arch-commits] Commit in gcc/trunk (PKGBUILD r158095.patch)
Allan McRae
allan at archlinux.org
Thu Jul 22 09:25:55 UTC 2010
Date: Thursday, July 22, 2010 @ 05:25:54
Author: allan
Revision: 85909
upgpkg: gcc 4.5.0-7
fix FS#20249 and FS#20242
Added:
gcc/trunk/r158095.patch
Modified:
gcc/trunk/PKGBUILD
---------------+
PKGBUILD | 30 ++++++++++++++++++------------
r158095.patch | 13 +++++++++++++
2 files changed, 31 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-22 04:50:42 UTC (rev 85908)
+++ PKGBUILD 2010-07-22 09:25:54 UTC (rev 85909)
@@ -7,9 +7,9 @@
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada')
pkgver=4.5.0
-pkgrel=6
+pkgrel=7
_snapshot=4.5-20100610
-_libstdcppmanver=20100312 # Note: check source directory name when updating this
+_libstdcppmanver=20100719 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'custom')
@@ -18,20 +18,23 @@
options=('!libtool' '!emptydirs')
source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
+ ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch
- r160561.patch)
+ r160561.patch
+ r158095.patch)
md5sums=('d0c6573f18e61d0a6c6fe742066346cd'
'4c5369d27b8cb4c4e447553f064d0f16'
'2c191ab600e600c774a65674c542e210'
'a569128d6daf741b242e39f5c24debe4'
'a7527896c33759ccc40bb82173f8f27f'
- 'f9a21b9dfc174f49a09ddaacfd3ac78f'
+ '226ae0c6364cfe2c1f7ac88d06088d5a'
'4030ee1c08dd1e843c0225b772360e76'
'6fd395bacbd7b6e47c7b74854b478363'
- '79cb26e66eb2502171ef69438fa8666d')
+ '79cb26e66eb2502171ef69438fa8666d'
+ '982bb1e959f3a36d2e205dec1e5b31a1')
+
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
else
@@ -53,13 +56,16 @@
sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
if [ "${CARCH}" = "x86_64" ]; then
- patch -Np1 -i ../gcc_pure64.patch || return 1
+ patch -Np1 -i ../gcc_pure64.patch
fi
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1
+ patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44258
- patch -Np1 -i ${srcdir}/r160561.patch || return 1
+ patch -Np1 -i ${srcdir}/r160561.patch
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45008
+ patch -Np1 -i ${srcdir}/r158095.patch
+
echo ${pkgver} > gcc/BASE-VER
mkdir build && cd build
@@ -71,7 +77,7 @@
--with-system-zlib --with-ppl --with-cloog \
--libdir=/usr/lib --libexecdir=/usr/lib \
--mandir=/usr/share/man --infodir=/usr/share/info
- make || return 1
+ make
}
package_gcc-libs()
@@ -112,7 +118,7 @@
cd ${_basedir}/build
# much, much easier to install the lot and clean-up the mess
- make -j1 DESTDIR=${pkgdir} install || return 1
+ make -j1 DESTDIR=${pkgdir} install
rm $pkgdir/usr/bin/{*gfortran,gnat*}
rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}/*
rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a}
@@ -158,7 +164,7 @@
# install the libstdc++ man pages
install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/libstdc++-man.${_libstdcppmanver}/man3/* \
+ install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \
${pkgdir}/usr/share/man/man3/
# deal with conflicts...
rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3
Added: r158095.patch
===================================================================
--- r158095.patch (rev 0)
+++ r158095.patch 2010-07-22 09:25:54 UTC (rev 85909)
@@ -0,0 +1,13 @@
+--- a/gcc/cp/decl.c
++++ b/gcc/cp/decl.c
+@@ -12023,9 +12023,7 @@ start_preparsed_function (tree decl1, tree attrs, int flags)
+
+ if ((DECL_DECLARED_INLINE_P (decl1)
+ || DECL_TEMPLATE_INSTANTIATION (decl1))
+- && ! DECL_INTERFACE_KNOWN (decl1)
+- /* Don't try to defer nested functions for now. */
+- && ! decl_function_context (decl1))
++ && ! DECL_INTERFACE_KNOWN (decl1))
+ DECL_DEFER_OUTPUT (decl1) = 1;
+ else
+ DECL_INTERFACE_KNOWN (decl1) = 1;
More information about the arch-commits
mailing list