From 47a853ebcdcec810ad8e95ef3783e73e8dd0e365 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 28 Nov 2012 09:21:55 -0600
Subject: binutils: 2.23.1

---
 abs/core/binutils/PKGBUILD         | 51 ++++++++++++++++----------------------
 abs/core/binutils/binutils.install |  2 +-
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/abs/core/binutils/PKGBUILD b/abs/core/binutils/PKGBUILD
index fefc124..a4d2839 100644
--- a/abs/core/binutils/PKGBUILD
+++ b/abs/core/binutils/PKGBUILD
@@ -1,45 +1,34 @@
-# $Id: PKGBUILD 163511 2012-07-14 13:06:56Z allan $
+# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.22
-pkgrel=9
-_date=20120323
+pkgver=2.23.1
+pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
 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.bz2{,.sig})
+md5sums=('33adb18c3048d057ac58d07a3f1adb38'
+         '1869b37216e7d7eff7e335a69e0882fd')
 
 build() {
   cd ${srcdir}
   mkdir binutils-build && cd binutils-build
 
-  [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
-  ${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
@@ -65,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() {
@@ -77,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
@@ -86,11 +74,14 @@ 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}*
+
+  # why are these distributed with binutils?
+  rm ${pkgdir}/usr/share/info/{configure,standards}.info
 
   # 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
 }
diff --git a/abs/core/binutils/binutils.install b/abs/core/binutils/binutils.install
index 8bf9f3a..9de0533 100644
--- a/abs/core/binutils/binutils.install
+++ b/abs/core/binutils/binutils.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
 
 post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
-- 
cgit v0.12