diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-09 13:03:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-09 13:03:24 -0300 |
commit | 06a22f3bf7a44edf24bd02b6023cf05a6bc77256 (patch) | |
tree | 583c62f4fbd0d8ed3401fb1f34ea5756b8aee8d4 /multilib-testing/gcc-multilib/PKGBUILD | |
parent | d54a0874c6641a08e4cc71269e8be3a1919e70a4 (diff) | |
parent | 498f3fc095103b2a220a00b27d43f4dae02d5459 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
extra/qt/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/pidgin/PKGBUILD
Diffstat (limited to 'multilib-testing/gcc-multilib/PKGBUILD')
-rw-r--r-- | multilib-testing/gcc-multilib/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index de4f5f981..952d22b11 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48786 2011-06-05 16:11:31Z heftig $ +# $Id: PKGBUILD 48902 2011-06-07 12:26:35Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,14 +8,14 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.6.0 -pkgrel=6 +pkgrel=7 _snapshot=4.6-20110603 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' +makedepends=('binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' 'lib32-glibc>=2.13') options=('!libtool' '!emptydirs') source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 @@ -147,7 +147,7 @@ package_lib32-gcc-libs() package_gcc-multilib() { pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl') groups=('multilib-devel') provides=("gcc=$pkgver-$pkgrel") conflicts=('gcc') |