[SCM] hdf5 branch, master, updated. upstream/1.8.7-125-gce156a8
Julien Cristau
jcristau at debian.org
Fri Feb 24 10:16:09 UTC 2012
The following commit has been merged in the master branch:
commit beb4e4aa15e5cbd262e86fd4f55c5a38be07e273
Author: Julien Cristau <jcristau at debian.org>
Date: Fri Feb 17 17:42:13 2012 +0000
Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 8693d73..faea207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
* Stop building the c++ libraries, nothing uses them. And don't version the
libhdf5-7 symbols file, so the dependency can also be satisfied by the mpi
packages' Provides.
+ * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.
- -- Julien Cristau <jcristau at debian.org> Fri, 17 Feb 2012 11:36:46 +0100
+ -- Julien Cristau <jcristau at debian.org> Fri, 17 Feb 2012 17:41:35 +0000
hdf5 (1.8.8-7) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 45e9735..0052081 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ virtpack = $(package)-$(major_version)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//")
@@ -31,19 +31,19 @@ DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib
ARCH_FLAG=-s
ARCHS=alpha armel armhf amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
-ifeq ($(DEB_BUILD_ARCH),arm)
+ifeq ($(DEB_HOST_ARCH),arm)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),hppa)
+else ifeq ($(DEB_HOST_ARCH),hppa)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mips)
+else ifeq ($(DEB_HOST_ARCH),mips)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mipsel)
+else ifeq ($(DEB_HOST_ARCH),mipsel)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390)
+else ifeq ($(DEB_HOST_ARCH),s390)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390x)
+else ifeq ($(DEB_HOST_ARCH),s390x)
build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),sh4)
+else ifeq ($(DEB_HOST_ARCH),sh4)
build_openmpi = no
else
build_openmpi = yes
--
Hierarchical Data Format 5 (HDF5)
More information about the Pkg-grass-devel
mailing list