diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
| commit | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (patch) | |
| tree | 2d5fd72b25008b56e2121bb35665ebeaebd50140 /extra/hwloc | |
| parent | d84e7e621b059d11c483d6864cb1a549572d1821 (diff) | |
| parent | 139460a7a8b085588b699c488fd19b166db18a74 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/logrotate/PKGBUILD
extra/hwloc/PKGBUILD
extra/kdeutils/PKGBUILD
extra/lapack/PKGBUILD
extra/openmpi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mesa/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/hwloc')
| -rw-r--r-- | extra/hwloc/PKGBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index cc5b618f2..b7713d267 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 114641 2011-03-15 00:30:43Z stephane $ +# $Id: PKGBUILD 130527 2011-07-07 11:15:35Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2 +pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org/projects/hwloc/" @@ -14,8 +14,8 @@ depends=('sh') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.1/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ca99f6e7c9cb41ca0ce89171c817c1de1d9bbde1') +source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,9 +28,4 @@ package() { make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # Rename hwloc-gather-topology.sh script to be consistent with the upcoming version 1.2 - mv "${pkgdir}"/usr/bin/hwloc-gather-topology{.sh,} - mv "${pkgdir}"/usr/share/man/man1/hwloc-gather-topology{.sh.1,.1} - sed -i -e 's/hwloc-gather-topology.sh/hwloc-gather-topology/g' "${pkgdir}"/usr/share/man/man1/hwloc-gather-topology.1 } |