diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-29 17:28:52 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-29 17:28:52 +0100 |
commit | 3042526913e47b50cb98416c17706fdd6d212f8b (patch) | |
tree | bfa15ad0c5636644d5b3af67f91e318670e858ed /core/binutils/PKGBUILD | |
parent | 2b7860faa4cae1565b40b51ba904173f0f494c4a (diff) | |
parent | 29665004d902f751dedb1a4baaa896f9ed74c6b6 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libgeotiff/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
Diffstat (limited to 'core/binutils/PKGBUILD')
-rw-r--r-- | core/binutils/PKGBUILD | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 391389f5c..7f3292210 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,46 +1,34 @@ -# $Id: PKGBUILD 165342 2012-08-16 01:57:38Z allan $ +# $Id: PKGBUILD 169770 2012-10-28 11:11:44Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.22 -pkgrel=10 -_date=20120323 +pkgver=2.23 +pkgrel=1 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base-devel') depends=('glibc>=2.16' 'zlib') -checkdepends=('dejagnu') +checkdepends=('dejagnu' 'bc') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_22-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} +source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig}) +md5sums=('ed58f50d8920c3f1d9cb110d5c972c27' + '5293d43d444852f71f7c96c6295ba66d') build() { cd ${srcdir} mkdir binutils-build && cd binutils-build - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - [[ $CARCH == "mips64el" ]] && CONFIGFLAG="--disable-multilib --disable-werror" - - ${srcdir}/binutils/configure --prefix=/usr \ + ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ + --with-bugurl=https://bugs.archlinux.org/ \ --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG + --enable-plugins --enable-threads --enable-shared \ + --disable-werror --disable-multilib # check the host environment and makes sure all the necessary tools are available make configure-host @@ -66,11 +54,10 @@ build() { check() { cd ${srcdir}/binutils-build - + + # unset LDFLAGS as testsuite makes assumptions about which ones are active # do not abort on errors - manually check log files - # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) - make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ - CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true + make LDFLAGS="" -k check || true } package() { @@ -78,8 +65,8 @@ package() { make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include # install libraries rebuilt with -fPIC install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib @@ -87,11 +74,11 @@ package() { install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* + rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* # Remove these symlinks, they are not ABI stable. # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so + rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so } |