[arch-commits] Commit in hdf5-openmpi/repos (8 files)
Ronald van Haren
ronald at archlinux.org
Tue Sep 6 07:59:26 UTC 2016
Date: Tuesday, September 6, 2016 @ 07:59:25
Author: ronald
Revision: 275787
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hdf5-openmpi/repos/extra-i686/PKGBUILD
(from rev 275786, hdf5-openmpi/trunk/PKGBUILD)
hdf5-openmpi/repos/extra-i686/mpi.patch
(from rev 275786, hdf5-openmpi/trunk/mpi.patch)
hdf5-openmpi/repos/extra-x86_64/PKGBUILD
(from rev 275786, hdf5-openmpi/trunk/PKGBUILD)
hdf5-openmpi/repos/extra-x86_64/mpi.patch
(from rev 275786, hdf5-openmpi/trunk/mpi.patch)
Deleted:
hdf5-openmpi/repos/extra-i686/PKGBUILD
hdf5-openmpi/repos/extra-i686/mpi.patch
hdf5-openmpi/repos/extra-x86_64/PKGBUILD
hdf5-openmpi/repos/extra-x86_64/mpi.patch
------------------------+
/PKGBUILD | 134 +++++++++++++++++++++++++++++++++++++++++++++++
/mpi.patch | 36 ++++++++++++
extra-i686/PKGBUILD | 66 -----------------------
extra-i686/mpi.patch | 18 ------
extra-x86_64/PKGBUILD | 66 -----------------------
extra-x86_64/mpi.patch | 18 ------
6 files changed, 170 insertions(+), 168 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-09-06 07:59:18 UTC (rev 275786)
+++ extra-i686/PKGBUILD 2016-09-06 07:59:25 UTC (rev 275787)
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Tom K <tomk at runbox.com>
-# Contributor: Jed Brown <jed at 59A2.org>
-# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
-
-pkgname=hdf5-openmpi
-_pkgname=hdf5
-pkgver=1.10.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh' 'openmpi')
-makedepends=('time')
-provides=('hdf5')
-conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2
- mpi.patch)
-sha1sums=('5866dbbcd24485f6b206413e73f7205cb3c1196e'
- '658d4a3e537c9c76da3200effa8f95b656a21936')
-
-build() {
- cd "$srcdir/${_pkgname}-${pkgver/_/-}"
-
- # FS#33343
- patch -Np1 -i "${srcdir}/mpi.patch"
-
- ./configure \
- CXX="mpicxx" \
- CC="mpicc" \
- FC="mpif90" \
- F9X="mpif90" \
- RUNPARALLEL="mpirun" \
- OMPI_MCA_disable_memory_allocator=1 \
- --prefix=/usr \
- --with-pthread=/usr/lib/ \
- --enable-linux-lfs \
- --enable-unsupported \
- --enable-shared \
- --disable-static \
- --enable-build-mode=production \
- --with-zlib \
- --enable-parallel=yes \
- --enable-cxx \
- --disable-sharedlib-rpath
-
- make
-}
-
-package() {
- cd "$srcdir/${_pkgname}-${pkgver/_/-}"
-
- make -j1 DESTDIR="${pkgdir}" install
-
- install -d -m755 "$pkgdir/usr/share/$_pkgname"
- mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
-
- install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
- install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
- "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
Copied: hdf5-openmpi/repos/extra-i686/PKGBUILD (from rev 275786, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-09-06 07:59:25 UTC (rev 275787)
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+# Contributor: Jed Brown <jed at 59A2.org>
+# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
+
+pkgname=hdf5-openmpi
+_pkgname=hdf5
+pkgver=1.10.0_patch1
+_pkgver=1.10.0-patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh' 'openmpi')
+makedepends=('time')
+provides=('hdf5')
+conflicts=('hdf5')
+source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${_pkgver}/src/${_pkgname}-${_pkgver}.tar.bz2
+ mpi.patch)
+sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4'
+ '658d4a3e537c9c76da3200effa8f95b656a21936')
+
+build() {
+ cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+
+ # FS#33343
+ patch -Np1 -i "${srcdir}/mpi.patch"
+
+ ./configure \
+ CXX="mpicxx" \
+ CC="mpicc" \
+ FC="mpif90" \
+ F9X="mpif90" \
+ RUNPARALLEL="mpirun" \
+ OMPI_MCA_disable_memory_allocator=1 \
+ --prefix=/usr \
+ --with-pthread=/usr/lib/ \
+ --enable-linux-lfs \
+ --enable-unsupported \
+ --enable-shared \
+ --disable-static \
+ --enable-build-mode=production \
+ --with-zlib \
+ --enable-parallel=yes \
+ --enable-cxx \
+ --disable-sharedlib-rpath
+
+ make
+}
+
+package() {
+ cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+
+ make -j1 DESTDIR="${pkgdir}" install
+
+ install -d -m755 "$pkgdir/usr/share/$_pkgname"
+ mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
+
+ install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+ install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
+ "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
+
Deleted: extra-i686/mpi.patch
===================================================================
--- extra-i686/mpi.patch 2016-09-06 07:59:18 UTC (rev 275786)
+++ extra-i686/mpi.patch 2016-09-06 07:59:25 UTC (rev 275787)
@@ -1,18 +0,0 @@
-Prevent accidental inclusion of mpi c++ headers
-when hdf5.h is included third party library
-
-https://bugs.gentoo.org/show_bug.cgi?id=420777
-https://bugs.archlinux.org/task/33343
-
---- a/src/H5public.h
-+++ b/src/H5public.h
-@@ -58,6 +58,8 @@
- # include <stddef.h>
- #endif
- #ifdef H5_HAVE_PARALLEL
-+# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */
-+# define MPICH_SKIP_MPICXX
- # include <mpi.h>
- #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
- # include <mpio.h>
-
Copied: hdf5-openmpi/repos/extra-i686/mpi.patch (from rev 275786, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- extra-i686/mpi.patch (rev 0)
+++ extra-i686/mpi.patch 2016-09-06 07:59:25 UTC (rev 275787)
@@ -0,0 +1,18 @@
+Prevent accidental inclusion of mpi c++ headers
+when hdf5.h is included third party library
+
+https://bugs.gentoo.org/show_bug.cgi?id=420777
+https://bugs.archlinux.org/task/33343
+
+--- a/src/H5public.h
++++ b/src/H5public.h
+@@ -58,6 +58,8 @@
+ # include <stddef.h>
+ #endif
+ #ifdef H5_HAVE_PARALLEL
++# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */
++# define MPICH_SKIP_MPICXX
+ # include <mpi.h>
+ #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
+ # include <mpio.h>
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-09-06 07:59:18 UTC (rev 275786)
+++ extra-x86_64/PKGBUILD 2016-09-06 07:59:25 UTC (rev 275787)
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Tom K <tomk at runbox.com>
-# Contributor: Jed Brown <jed at 59A2.org>
-# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
-
-pkgname=hdf5-openmpi
-_pkgname=hdf5
-pkgver=1.10.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh' 'openmpi')
-makedepends=('time')
-provides=('hdf5')
-conflicts=('hdf5')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2
- mpi.patch)
-sha1sums=('5866dbbcd24485f6b206413e73f7205cb3c1196e'
- '658d4a3e537c9c76da3200effa8f95b656a21936')
-
-build() {
- cd "$srcdir/${_pkgname}-${pkgver/_/-}"
-
- # FS#33343
- patch -Np1 -i "${srcdir}/mpi.patch"
-
- ./configure \
- CXX="mpicxx" \
- CC="mpicc" \
- FC="mpif90" \
- F9X="mpif90" \
- RUNPARALLEL="mpirun" \
- OMPI_MCA_disable_memory_allocator=1 \
- --prefix=/usr \
- --with-pthread=/usr/lib/ \
- --enable-linux-lfs \
- --enable-unsupported \
- --enable-shared \
- --disable-static \
- --enable-build-mode=production \
- --with-zlib \
- --enable-parallel=yes \
- --enable-cxx \
- --disable-sharedlib-rpath
-
- make
-}
-
-package() {
- cd "$srcdir/${_pkgname}-${pkgver/_/-}"
-
- make -j1 DESTDIR="${pkgdir}" install
-
- install -d -m755 "$pkgdir/usr/share/$_pkgname"
- mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
-
- install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
- install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
- "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
Copied: hdf5-openmpi/repos/extra-x86_64/PKGBUILD (from rev 275786, hdf5-openmpi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-09-06 07:59:25 UTC (rev 275787)
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 147983 2012-01-29 11:26:22Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom K <tomk at runbox.com>
+# Contributor: Jed Brown <jed at 59A2.org>
+# Contributor: Simone Pezzuto <junki.gnu at gmail.com>
+
+pkgname=hdf5-openmpi
+_pkgname=hdf5
+pkgver=1.10.0_patch1
+_pkgver=1.10.0-patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh' 'openmpi')
+makedepends=('time')
+provides=('hdf5')
+conflicts=('hdf5')
+source=(ftp://ftp.hdfgroup.org/HDF5/releases/${_pkgname}-1.10/${_pkgname}-${_pkgver}/src/${_pkgname}-${_pkgver}.tar.bz2
+ mpi.patch)
+sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4'
+ '658d4a3e537c9c76da3200effa8f95b656a21936')
+
+build() {
+ cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+
+ # FS#33343
+ patch -Np1 -i "${srcdir}/mpi.patch"
+
+ ./configure \
+ CXX="mpicxx" \
+ CC="mpicc" \
+ FC="mpif90" \
+ F9X="mpif90" \
+ RUNPARALLEL="mpirun" \
+ OMPI_MCA_disable_memory_allocator=1 \
+ --prefix=/usr \
+ --with-pthread=/usr/lib/ \
+ --enable-linux-lfs \
+ --enable-unsupported \
+ --enable-shared \
+ --disable-static \
+ --enable-build-mode=production \
+ --with-zlib \
+ --enable-parallel=yes \
+ --enable-cxx \
+ --disable-sharedlib-rpath
+
+ make
+}
+
+package() {
+ cd "$srcdir/${_pkgname}-${pkgver/_/-}"
+
+ make -j1 DESTDIR="${pkgdir}" install
+
+ install -d -m755 "$pkgdir/usr/share/$_pkgname"
+ mv "$pkgdir"/usr/share/{hdf5_examples,$_pkgname/examples}
+
+ install -d -m755 "$pkgdir/usr/share/licenses/${pkgname}"
+ install -m644 "$srcdir/${_pkgname}-${pkgver/_/-}/COPYING" \
+ "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
+
Deleted: extra-x86_64/mpi.patch
===================================================================
--- extra-x86_64/mpi.patch 2016-09-06 07:59:18 UTC (rev 275786)
+++ extra-x86_64/mpi.patch 2016-09-06 07:59:25 UTC (rev 275787)
@@ -1,18 +0,0 @@
-Prevent accidental inclusion of mpi c++ headers
-when hdf5.h is included third party library
-
-https://bugs.gentoo.org/show_bug.cgi?id=420777
-https://bugs.archlinux.org/task/33343
-
---- a/src/H5public.h
-+++ b/src/H5public.h
-@@ -58,6 +58,8 @@
- # include <stddef.h>
- #endif
- #ifdef H5_HAVE_PARALLEL
-+# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */
-+# define MPICH_SKIP_MPICXX
- # include <mpi.h>
- #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
- # include <mpio.h>
-
Copied: hdf5-openmpi/repos/extra-x86_64/mpi.patch (from rev 275786, hdf5-openmpi/trunk/mpi.patch)
===================================================================
--- extra-x86_64/mpi.patch (rev 0)
+++ extra-x86_64/mpi.patch 2016-09-06 07:59:25 UTC (rev 275787)
@@ -0,0 +1,18 @@
+Prevent accidental inclusion of mpi c++ headers
+when hdf5.h is included third party library
+
+https://bugs.gentoo.org/show_bug.cgi?id=420777
+https://bugs.archlinux.org/task/33343
+
+--- a/src/H5public.h
++++ b/src/H5public.h
+@@ -58,6 +58,8 @@
+ # include <stddef.h>
+ #endif
+ #ifdef H5_HAVE_PARALLEL
++# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */
++# define MPICH_SKIP_MPICXX
+ # include <mpi.h>
+ #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
+ # include <mpio.h>
+
More information about the arch-commits
mailing list