[hdf5] 02/05: Allow disabling the MPI targets.

Gilles Filippini pini at moszumanska.debian.org
Thu Sep 11 17:39:18 UTC 2014


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository hdf5.

commit 615d4af894fcae64682c3dffc271681125c5ba27
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Sep 8 14:10:21 2014 +0200

    Allow disabling the MPI targets.
    
    Closes: #576004
---
 debian/control.in | 14 +++++++-------
 debian/rules      | 56 +++++++++++++++++++++++++++++++++----------------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index d29afd7..013d853 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -96,7 +96,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - serial vers
 Package: libhdf5-openmpi- at SONAME@
 Section: libs
 Priority: extra
-Architecture: @ARCHS@
+Architecture: @OMPIARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -111,7 +111,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
 Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
-Architecture: @ARCHS@
+Architecture: @OMPIARCHS@
 Depends: libhdf5-openmpi- at SONAME@ (= ${binary:Version}), zlib1g-dev,
  libjpeg-dev, libopenmpi-dev, ${misc:Depends}
 Suggests: libhdf5-doc
@@ -126,7 +126,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver
 Package: libhdf5-openmpi- at SONAME@-dbg
 Section: debug
 Priority: extra
-Architecture: @ARCHS@
+Architecture: @OMPIARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi- at SONAME@ (= ${binary:Version}),
 Multi-Arch: same
@@ -141,7 +141,7 @@ Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
 Package: libhdf5-mpich- at SONAME@
 Section: libs
 Priority: extra
-Architecture: any
+Architecture: @MPICHARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Replaces: libhdf5-mpich2- at SONAME@ (<< 1.8.12-2~)
@@ -159,7 +159,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
 Package: libhdf5-mpich-dev
 Section: libdevel
 Priority: extra
-Architecture: any
+Architecture: @MPICHARCHS@
 Depends: libhdf5-mpich- at SONAME@ (= ${binary:Version}), zlib1g-dev,
  libjpeg-dev, libmpich-dev, ${misc:Depends}
 Replaces: libhdf5-mpich2-dev (<< 1.8.12-2~)
@@ -190,7 +190,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi
 Package: libhdf5-mpich- at SONAME@-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: @MPICHARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-mpich- at SONAME@ (= ${binary:Version}),
 Replaces: libhdf5-mpich2- at SONAME@-dbg (<< 1.8.12-2~)
@@ -207,7 +207,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Mpich Debug package
 Package: libhdf5-mpi-dev
 Section: libdevel
 Priority: extra
-Architecture: any
+Architecture: all
 Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends}
 Description: Hierarchical Data Format 5 (HDF5) - development files - default MPI version
  HDF5 is a file format and library for storing scientific data.
diff --git a/debian/rules b/debian/rules
index 9612dab..cb8d4e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,18 +33,29 @@ include /usr/share/mpi-default-dev/debian_defaults
 endif
 DEFAULT_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 
+# Arches to build MPI flavors on
+# Setting empty OMPIARCHS and MPICHARCHS environment variables disables
+# the related mpi targets
+#
 # To be used if openmpi binary packages were buildable on any arch
 #ARCH_FLAG=-a
 #ARCHS=any
 ARCH_FLAG=-s
-ARCHS=alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+OMPIARCHS?=alpha amd64 armel armhf arm64 i386 ia64 powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
+MPICHARCHS?=any
 
-ifeq (,$(filter $(DEB_HOST_ARCH),$(ARCHS)))
+ifeq (,$(or $(filter $(DEB_HOST_ARCH),$(OMPIARCHS)),$(filter any,$(OMPIARCHS))))
 build_openmpi = no
 else
 build_openmpi = yes
 endif
 
+ifeq (,$(or $(filter $(DEB_HOST_ARCH),$(MPICHARCHS)),$(filter any,$(MPICHARCHS))))
+build_mpich = no
+else
+build_mpich = yes
+endif
+
 ifeq ($(build_openmpi),yes)
 configure_stamp_openmpi = configure-stamp-openmpi
 build_stamp_openmpi = build-stamp-openmpi
@@ -55,25 +66,22 @@ build_stamp_openmpi =
 install_openmpi =
 endif
 
+ifeq ($(build_mpich),yes)
+configure_stamp_mpich = configure-stamp-mpich
+build_stamp_mpich = build-stamp-mpich
+install_mpich = install-mpich
+else
+configure_stamp_mpich =
+build_stamp_mpich =
+install_mpich =
+endif
+
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        USE_PROD = yes
 else
        USE_PROD = no
 endif
 
-### let's keep it commented out in case a compiler error happens again
-# ifeq (hppa-linux,$(DEB_BUILD_GNU_TYPE))
-#   DEBCC=gcc-3.2
-#   DEBCXX=g++-3.2
-# else
-#    DEBCC=gcc
-#    DEBCXX=g++
-#    DEBFORTRAN=gfortran
-# With gcc 4.3+ force optimization off, else some tests fail...
-#    DEBOPT=-O0
-# endif
-###
-
 # export DEB_BUILD_OPTIONS="parallel=2"
 #
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -93,7 +101,7 @@ OPENMPI_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIA
 MPICH_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/hdf5/mpich --with-flavor=mpich
 
 configure: configure-stamp-debian configure-stamp \
-	   $(configure_stamp_openmpi) configure-stamp-mpich
+	   $(configure_stamp_openmpi) $(configure_stamp_mpich)
 
 configure-stamp-debian: debian/control.in
 	# This loop generates helper files from debian/*.*.in templates
@@ -174,7 +182,7 @@ prep:
 
 
 build: build-arch build-indep
-build-arch: build-stamp $(build_stamp_openmpi) build-stamp-mpich
+build-arch: build-stamp $(build_stamp_openmpi) $(build_stamp_mpich)
 build-indep: build-stamp-doc
 
 build-stamp: configure-stamp
@@ -205,12 +213,12 @@ build-stamp-doc: configure-stamp
 test: build-stamp
 	$(MAKE) -C debian/build/ test
 
-clean: 
+clean:
 	test -f debian/control.in
 	-rm -rf debian/build
 	-rm -rf debian/build-openmpi
 	-rm -rf debian/build-mpich
-	grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e "s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
+	grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e "s/@OMPIARCHS@/$(OMPIARCHS)/" -e "s/@MPICHARCHS@/$(MPICHARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
 	dh_autoreconf_clean
 	rm -rf m4
 	-cd debian && rm -f `ls libhdf5-*.install libhdf5-*.shlibs libhdf5-*.doc | grep -v 'libhdf5-doc'`
@@ -221,7 +229,7 @@ clean:
 	-rm -f debian/man/h5pfc.*.1
 	dh_clean configure-stamp* build-stamp* install-stamp*
 
-install: build prep install-serial $(install_openmpi) install-mpich install-doc
+install: build prep install-serial $(install_openmpi) $(install_mpich) install-doc
 
 install-serial: build-stamp
 	dh_testdir
@@ -284,7 +292,7 @@ binary-indep: install-doc
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: prep install-serial $(install_openmpi) install-mpich
+binary-arch: prep install-serial $(install_openmpi) $(install_mpich)
 	dh_testdir
 	dh_testroot
 	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
@@ -297,7 +305,9 @@ binary-arch: prep install-serial $(install_openmpi) install-mpich
 	dh_strip -phdf5-helpers
 	dh_strip -p$(serpack) --dbg-package=$(serpack)-dbg
 	dh_strip -p$(sercpppack) --dbg-package=$(sercpppack)-dbg
+ifeq ($(build_mpich),yes)
 	dh_strip -p$(mpichpack) --dbg-package=$(mpichpack)-dbg
+endif
 ifeq ($(build_openmpi),yes)
 	dh_strip -p$(openmpipack) --dbg-package=$(openmpipack)-dbg
 endif
@@ -317,7 +327,9 @@ endif
 ifeq ($(build_openmpi),yes)
 	dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -lusr/lib/$(DEB_HOST_MULTIARCH)
 endif
+ifeq ($(build_mpich),yes)
 	dh_shlibdeps -p$(mpichpack) -L$(mpichpack) -lusr/lib/$(DEB_HOST_MULTIARCH)
+endif
 	dh_gencontrol $(ARCH_FLAG)
 	dh_md5sums $(ARCH_FLAG)
 	dh_builddeb $(ARCH_FLAG)
@@ -328,4 +340,4 @@ binary: binary-indep binary-arch
 		install-doc install-serial install-openmpi install-mpich prep
 
 .NOTPARALLEL: configure-stamp-debian configure-stamp \
-	   $(configure_stamp_openmpi) configure-stamp-mpich
+	   $(configure_stamp_openmpi) $(configure_stamp_mpich)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git



More information about the Pkg-grass-devel mailing list