diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-12 17:27:25 +0200 |
| commit | e6a52ebf66f2b60ad1afb478bfe358514043b676 (patch) | |
| tree | 7b7bd6feb01ddf1f0340523bd02903b57b76885e /extra/elfutils | |
| parent | 678a7a4fb762d6669c9c2105b78d107aeebe163e (diff) | |
| parent | 21c375ba65c4730e25cd0b135aff7811bf28c77a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/haskell-html/PKGBUILD
community-staging/haskell-regex-base/PKGBUILD
community-staging/haskell-stm/PKGBUILD
community-staging/haskell-terminfo/PKGBUILD
extra/avahi/PKGBUILD
extra/elfutils/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/elfutils')
| -rw-r--r-- | extra/elfutils/PKGBUILD | 26 | ||||
| -rw-r--r-- | extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch | 16 |
2 files changed, 27 insertions, 15 deletions
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 091962b0e..8ffcd12f6 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,12 +1,12 @@ -# $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" -arch=('i686' 'x86_64' 'mips64el') +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') depends=('gcc-libs' 'zlib' 'bzip2' 'xz') @@ -14,21 +14,17 @@ 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 - http://cdn.debian.net/debian/pool/main/e/elfutils/elfutils_${pkgver}-1.debian.tar.gz) +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}" - for patch in $(cat ../debian/patches/series) ; do - patch -Np1 -i "../debian/patches/$patch" - done - 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 |