[cdo] 05/11: Disable openmp on hppa to fix FTBFS

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit c91e6353097d658aee3db2b9dbab371192589df7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Mar 27 16:41:46 2017 +0100

    Disable openmp on hppa to fix FTBFS
---
 debian/changelog | 6 ++++++
 debian/rules     | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f4f0b72..a1dbdf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cdo (1.8.0+dfsg.1-2) UNRELEASED; urgency=medium
+
+  * Disable openmp on hppa to fix FTBFS
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 27 Mar 2017 16:41:32 +0100
+
 cdo (1.8.0+dfsg.1-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 4fc6047..c47d59c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,12 @@ else
   WITH_HDF5:=--with-hdf5=/usr
 endif
 
+ifeq ($(ARCH),hppa)
+  WITH_OPENMP:=--disable-openmp
+else
+  WITH_OPENMP:=--enable-openmp
+endif
+  
 override_dh_auto_clean:
 	dh_auto_clean	|| echo "distclean ok"
 	#rm -f cdo.settings src/config.h  libtool libcdi/config.log libcdi/config.status src/stamp-h1 confdefs.h
@@ -67,7 +73,8 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h 
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
-		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr $(WITH_HDF5) \
+		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr \
+		$(WITH_OPENMP) $(WITH_HDF5) \
 		--enable-iso-c-interface  --with-fftw3 --with-curl=/usr --with-udunits2=/usr \
 		--with-szlib \
 		--with-grib-api=/usr --disable-cgribex --with-magics=/usr  FC=gfortran \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git