[arch-commits] Commit in binutils/trunk (PKGBUILD)

[Allan McRae]

    Date: Wednesday, October 24, 2012 @ 03:44:55
  Author: allan
Revision: 169600

upstream update, use released sources rather than vcs snapshots, tidy configure options, minimise test-suite failures

Modified:
  binutils/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-24 07:18:13 UTC (rev 169599)
+++ PKGBUILD	2012-10-24 07:44:55 UTC (rev 169600)
@@ -12,7 +12,7 @@
 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.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
@@ -23,13 +23,12 @@
   cd ${srcdir}
   mkdir binutils-build && cd binutils-build
 
-  [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
   ${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
@@ -55,11 +54,10 @@
 
 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() {