[arch-commits] Commit in hdf5/repos (6 files)
Ronald van Haren
ronald at nymeria.archlinux.org
Sat May 11 08:31:07 UTC 2013
Date: Saturday, May 11, 2013 @ 10:31:06
Author: ronald
Revision: 185112
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hdf5/repos/extra-i686/PKGBUILD
(from rev 185111, hdf5/trunk/PKGBUILD)
hdf5/repos/extra-i686/mpi.patch
(from rev 185111, hdf5/trunk/mpi.patch)
hdf5/repos/extra-x86_64/PKGBUILD
(from rev 185111, hdf5/trunk/PKGBUILD)
hdf5/repos/extra-x86_64/mpi.patch
(from rev 185111, hdf5/trunk/mpi.patch)
Deleted:
hdf5/repos/extra-i686/PKGBUILD
hdf5/repos/extra-x86_64/PKGBUILD
------------------------+
/PKGBUILD | 102 +++++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 45 --------------------
extra-i686/mpi.patch | 18 ++++++++
extra-x86_64/PKGBUILD | 45 --------------------
extra-x86_64/mpi.patch | 18 ++++++++
5 files changed, 138 insertions(+), 90 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-05-11 08:30:46 UTC (rev 185111)
+++ extra-i686/PKGBUILD 2013-05-11 08:31:06 UTC (rev 185112)
@@ -1,45 +0,0 @@
-# $Id$
-# 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>
-
-pkgname=hdf5
-pkgver=1.8.10
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh')
-makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
-
-build() {
- cd $srcdir/${pkgname}-${pkgver/_/-}
- export CFLAGS="${CFLAGS/O2/O0}"
- export CXXFLAGS="${CFLAGS}"
- ./configure --prefix=/usr --disable-static \
- --enable-hl \
- --enable-threadsafe \
- --enable-linux-lfs \
- --enable-production \
- --with-pic \
- --docdir=/usr/share/doc/hdf5/ \
- --with-pthread=/usr/lib/ \
- --disable-sharedlib-rpath
- make
-}
-
-package() {
- cd $srcdir/${pkgname}-${pkgver/_/-}
-
- make -j1 DESTDIR=${pkgdir} install
-
- install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
- install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
- $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
-
Copied: hdf5/repos/extra-i686/PKGBUILD (from rev 185111, hdf5/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-05-11 08:31:06 UTC (rev 185112)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+
+pkgname=hdf5
+pkgver=1.8.10_patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh')
+makedepends=('time')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2
+mpi.patch)
+options=('!libtool')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+ '658d4a3e537c9c76da3200effa8f95b656a21936')
+
+build() {
+ cd $srcdir/${pkgname}-${pkgver/_/-}
+
+ # FS#33343
+ patch -Np1 -i ${srcdir}/mpi.patch
+
+ export CFLAGS="${CFLAGS/O2/O0}"
+ export CXXFLAGS="${CFLAGS}"
+ ./configure --prefix=/usr --disable-static \
+ --enable-hl \
+ --enable-threadsafe \
+ --enable-linux-lfs \
+ --enable-production \
+ --with-pic \
+ --docdir=/usr/share/doc/hdf5/ \
+ --with-pthread=/usr/lib/ \
+ --disable-sharedlib-rpath
+ make
+}
+
+package() {
+ cd $srcdir/${pkgname}-${pkgver/_/-}
+
+ make -j1 DESTDIR=${pkgdir} install
+
+ install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+ install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
+ $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}
+
Copied: hdf5/repos/extra-i686/mpi.patch (from rev 185111, hdf5/trunk/mpi.patch)
===================================================================
--- extra-i686/mpi.patch (rev 0)
+++ extra-i686/mpi.patch 2013-05-11 08:31:06 UTC (rev 185112)
@@ -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 2013-05-11 08:30:46 UTC (rev 185111)
+++ extra-x86_64/PKGBUILD 2013-05-11 08:31:06 UTC (rev 185112)
@@ -1,45 +0,0 @@
-# $Id$
-# 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>
-
-pkgname=hdf5
-pkgver=1.8.10
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="General purpose library and file format for storing scientific data"
-url="http://www.hdfgroup.org/HDF5/"
-license=('custom')
-depends=('zlib' 'sh')
-makedepends=('time')
-source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('867a91b75ee0bbd1f1b13aecd52e883be1507a2c')
-
-build() {
- cd $srcdir/${pkgname}-${pkgver/_/-}
- export CFLAGS="${CFLAGS/O2/O0}"
- export CXXFLAGS="${CFLAGS}"
- ./configure --prefix=/usr --disable-static \
- --enable-hl \
- --enable-threadsafe \
- --enable-linux-lfs \
- --enable-production \
- --with-pic \
- --docdir=/usr/share/doc/hdf5/ \
- --with-pthread=/usr/lib/ \
- --disable-sharedlib-rpath
- make
-}
-
-package() {
- cd $srcdir/${pkgname}-${pkgver/_/-}
-
- make -j1 DESTDIR=${pkgdir} install
-
- install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
- install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
- $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
-
Copied: hdf5/repos/extra-x86_64/PKGBUILD (from rev 185111, hdf5/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-05-11 08:31:06 UTC (rev 185112)
@@ -0,0 +1,51 @@
+# $Id$
+# 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>
+
+pkgname=hdf5
+pkgver=1.8.10_patch1
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="General purpose library and file format for storing scientific data"
+url="http://www.hdfgroup.org/HDF5/"
+license=('custom')
+depends=('zlib' 'sh')
+makedepends=('time')
+source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2
+mpi.patch)
+options=('!libtool')
+sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+ '658d4a3e537c9c76da3200effa8f95b656a21936')
+
+build() {
+ cd $srcdir/${pkgname}-${pkgver/_/-}
+
+ # FS#33343
+ patch -Np1 -i ${srcdir}/mpi.patch
+
+ export CFLAGS="${CFLAGS/O2/O0}"
+ export CXXFLAGS="${CFLAGS}"
+ ./configure --prefix=/usr --disable-static \
+ --enable-hl \
+ --enable-threadsafe \
+ --enable-linux-lfs \
+ --enable-production \
+ --with-pic \
+ --docdir=/usr/share/doc/hdf5/ \
+ --with-pthread=/usr/lib/ \
+ --disable-sharedlib-rpath
+ make
+}
+
+package() {
+ cd $srcdir/${pkgname}-${pkgver/_/-}
+
+ make -j1 DESTDIR=${pkgdir} install
+
+ install -d -m755 $pkgdir/usr/share/licenses/${pkgname}
+ install -m644 $srcdir/${pkgname}-${pkgver/_/-}/COPYING \
+ $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}
+
Copied: hdf5/repos/extra-x86_64/mpi.patch (from rev 185111, hdf5/trunk/mpi.patch)
===================================================================
--- extra-x86_64/mpi.patch (rev 0)
+++ extra-x86_64/mpi.patch 2013-05-11 08:31:06 UTC (rev 185112)
@@ -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