diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
| commit | 01346da4de50d9eda2660653fcaae6c1abfaa28a (patch) | |
| tree | bd7bb7e3f004777c788f809c5a5a10a69839be13 /core/gcc | |
| parent | 5bc312c4c7af74bbbb6042c5856bac6e53efa32c (diff) | |
| parent | 1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-chewing/PKGBUILD
community/fcitx-cloudpinyin/PKGBUILD
community/fcitx-rime/PKGBUILD
community/linux-tools/PKGBUILD
community/lxpanel/PKGBUILD
community/pdns/PKGBUILD
core/bash/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/json-c/PKGBUILD
extra/liblouis/PKGBUILD
extra/live-media/PKGBUILD
extra/samba/PKGBUILD
extra/transmission/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'core/gcc')
| -rw-r--r-- | core/gcc/PKGBUILD | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 9318c3397..9587d0aee 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173936 2012-12-28 13:10:57Z allan $ +# $Id: PKGBUILD 176037 2013-01-26 23:37:17Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,7 +10,7 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.7.2 -pkgrel=3 +pkgrel=4 #_snapshot=4.7-20120721 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -22,14 +22,8 @@ checkdepends=('dejagnu') options=('!libtool' '!emptydirs' '!distcc' '!makeflags') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - gcc_pure64.patch - gcc_mips64el_lib.patch - gcc-4.7.1-libada-pic.patch gcc-4.7.1-libgo-write.patch) md5sums=('cc308a0891e778cfda7a151ab8a6e762' - 'ced48436c1b3c981d721a829f1094de1' - '474b8f5a7dee6ddd96b95a7240bfb961' - '2acbc9d35cc9d72329dc71d6b1f162ef' 'df82dd175ac566c8a6d46b11ac21f14c') if [ -n "${_snapshot}" ]; then @@ -47,20 +41,19 @@ build() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - if [ "${CARCH}" = "x86_64" ]; then - patch -p1 -i ${srcdir}/gcc_pure64.patch - elif [ "${CARCH}" = "mips64el" ]; then - patch -p1 -i ${srcdir}/gcc_mips64el_lib.patch - fi + # Arch Linux installs x86_64 libraries /lib + [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch - - # bug to file... - patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch echo ${pkgver} > gcc/BASE-VER + # using -pipe causes spurious test-suite failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 + CFLAGS=${CFLAGS/-pipe/} + CXXFLAGS=${CXXFLAGS/-pipe/} + cd ${srcdir} mkdir gcc-build && cd gcc-build |