[cdo] 37/84: Don't use magics on mips

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cdo.

commit 709b137c487f5ac40570f251c489a899e0a05a4c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Sep 3 09:54:43 2013 +0100

    Don't use magics on mips
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d65913e..213753b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cdo (1.6.1+dfsg.1-3) unstable; urgency=low
+
+  * Don't build-dep (or use) magics++ on mips, as magics++ requires grib-api
+    which doesn't build on mips (yet).  
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 03 Sep 2013 09:53:27 +0100
+
 cdo (1.6.1+dfsg.1-2) unstable; urgency=low
 
   * Add updated watch file. 
diff --git a/debian/control b/debian/control
index d56f069..6da91ab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), dh-buildinfo, libproj-dev, autoconf, automake, libnetcdf-dev, gfortran, dh-autoreconf,
- libgrib-api-dev [!mips !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev,
+ libgrib-api-dev [!mips !hppa], libtool, libjasper-dev, cfortran,  libhdf5-serial-dev, libmagics++-dev [!mips !hppa],
  libcurl4-gnutls-dev | libcurl4-openssl-dev  | libcurl4-nss-dev, libpng12-dev | libpng-dev
 Standards-Version: 3.9.4
 Homepage: https://code.zmaw.de/projects/cdo
diff --git a/debian/rules b/debian/rules
index f771816..3ff1b28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ARCH:=$(shell dpkg --print-architecture)
 WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
 WITH_JASPER:= --with-jasper=/usr
 AS_NEEDED= -Wl,--as-needed
+WITH_MAGICS:= --with-magics=/usr
 
 # export LIBTOOLIZE=true
 
@@ -48,10 +49,12 @@ endif
 ifeq ($(ARCH), mips)
   WITH_GRIB:=
   WITH_JASPER:=
+  WITH_MAGICS:=
 endif
 ifeq ($(ARCH), hppa)
   WITH_GRIB:=
   WITH_JASPER:=
+  WITH_MAGICS:=
 endif
 
 override_dh_auto_clean:
@@ -77,8 +80,8 @@ 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=/usr \
-		--enable-iso-c-interface   --with-magics=/usr \
-		 $(WITH_GRIB) $(WITH_JASPER)  FC=gfortran \
+		--enable-iso-c-interface  \
+		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
 		LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"
 	#rm -f libtool libcdi/libtool

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