diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-02 16:09:26 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-02 16:09:26 +0000 |
| commit | a48bbba0b0090fbdb54779f73c1b792787c7f0e3 (patch) | |
| tree | a60dfc3a62113cf04c4026295b2497099a74b129 /sci-libs/hdf5 | |
| parent | Version bump. (diff) | |
| download | gentoo-2-a48bbba0b0090fbdb54779f73c1b792787c7f0e3.tar.gz gentoo-2-a48bbba0b0090fbdb54779f73c1b792787c7f0e3.tar.bz2 gentoo-2-a48bbba0b0090fbdb54779f73c1b792787c7f0e3.zip | |
Set CC=mpicc when building with mpi enabled (bug #286353), added --enabled-shared which was disabled with mpi enabled (bug #287124), and added slashes in destdir patch
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/hdf5')
| -rw-r--r-- | sci-libs/hdf5/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch | 8 | ||||
| -rw-r--r-- | sci-libs/hdf5/hdf5-1.8.3-r1.ebuild | 16 |
3 files changed, 20 insertions, 12 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog index f8e11abaa7f4..ad3b8a077406 100644 --- a/sci-libs/hdf5/ChangeLog +++ b/sci-libs/hdf5/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/hdf5 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.40 2009/10/01 19:27:44 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.41 2009/10/02 16:09:26 bicatali Exp $ + + 02 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> hdf5-1.8.3-r1.ebuild, + files/hdf5-1.8.3-destdir.patch: + Set CC=mpicc when building with mpi enabled (bug #286353), added + --enabled-shared which was disabled with mpi enabled (bug #287124), and + added slashes in destdir patch 01 Oct 2009; Tobias Klausmann <klausman@gentoo.org> hdf5-1.8.3-r1.ebuild: Keyworded on alpha, bug #285148 diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch index 41cf505f1658..82aa2120875c 100644 --- a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch +++ b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch @@ -5,7 +5,7 @@ # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): - -$(top_srcdir)/bin/mkdirs $@ -+ -$(top_srcdir)/bin/mkdirs $(DESTDIR)$@ ++ -$(top_srcdir)/bin/mkdirs $(DESTDIR)/$@ # Install and uninstall rules. We install the source files, not the # example programs themselves. @@ -14,15 +14,15 @@ @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ - (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ -+ (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);\ ++ (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(EXAMPLEDIR)/. || exit 1);\ fi; \ done uninstall-examples: - @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ - set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ -+ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \ -+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ ++ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)/$(EXAMPLEDIR); then \ ++ set -x; cd $(DESTDIR)/$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \ fi installcheck-local: diff --git a/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild index 7d4f752b40b7..c8ab06a72696 100644 --- a/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild +++ b/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild,v 1.3 2009/10/01 19:27:44 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild,v 1.4 2009/10/02 16:09:26 bicatali Exp $ EAPI=2 inherit eutils autotools @@ -27,12 +27,13 @@ DEPEND="${RDEPEND} sys-process/time" pkg_setup() { - if use mpi && use cxx; then - ewarn "Simultaneous mpi and cxx is not supported by ${PN}" - ewarn "Will disable cxx interface" - fi - if use mpi && use fortran; then - export FC=mpif90 + if use mpi; then + if use cxx; then + ewarn "Simultaneous mpi and cxx is not supported by ${PN}" + ewarn "Will disable cxx interface" + fi + export CC=mpicc + use fortran && export FC=mpif90 fi } @@ -72,6 +73,7 @@ src_configure() { --enable-production \ --enable-strict-format-checks \ --enable-deprecated-symbols \ + --enable-shared \ $(use_enable fortran) \ $(use_enable mpi parallel) \ $(use_with szip szlib) \ |