From db1cd10264e7cd2810148efd50ce612288343839 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 12 Sep 2012 00:03:33 +0000
Subject: Wed Sep 12 00:03:32 UTC 2012

---
 extra/elfutils/PKGBUILD                              | 20 ++++++++++----------
 .../elfutils-0.155-binutils-pr-ld-13621.patch        | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch

(limited to 'extra/elfutils')

diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 8cbee1e68..37075ff99 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163718 2012-07-18 03:05:26Z eric $
-# Maintainer: 
+# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.154
+pkgver=0.155
 pkgrel=1
-pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
+pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/elfutils/"
 license=('LGPL3' 'GPL' 'GPL3')
@@ -14,16 +14,16 @@ provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
 options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} \
-        elfutils-0.154-binutils-pr-ld-13621.patch)
-sha1sums=('3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b'
-          '956461d44b03823e0b448e78b1f4aa25ef269e1e'
-          '09681b728edb86c77eed47286554bef048f3507f')
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
+        elfutils-0.155-binutils-pr-ld-13621.patch)
+sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
+          'fcd0ebd029b305bf030983daf151a2a1ab5294af'
+          '8a8be7c0686c6311c1ce969ba10494e704ead48c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   CFLAGS+=" -g"  # required for test-suite success
-  patch -p1 -i "${srcdir}/elfutils-0.154-binutils-pr-ld-13621.patch"
+  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
   ./configure --prefix=/usr --program-prefix="eu-"
   make
 }
diff --git a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
new file mode 100644
index 000000000..7f99ac0be
--- /dev/null
+++ b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
+index 4b01008..7a5f0c8 100755
+--- a/tests/run-elflint-self.sh
++++ b/tests/run-elflint-self.sh
+@@ -18,4 +18,11 @@
+ 
+ . $srcdir/test-subr.sh
+ 
++# Makes sure we exit cleanly even when we don't...
++clean_exit()
++{
++  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
++}
++trap clean_exit EXIT
++
+ testrun_on_self ../src/elflint --quiet --gnu-ld
-- 
cgit v1.2.3-54-g00ecf