[odb-api] 04/21: WIP: Current build

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Aug 30 06:42:48 UTC 2017


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

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit f5e9c9e86ead3b49157a56cd144dd56b09fce833
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 29 13:49:33 2017 +0100

    WIP: Current build
---
 debian/control | 18 ++++++++++++++----
 debian/rules   | 22 ++++++++--------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 2e4deaa..00e7dce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,21 @@ Source: odb-api
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>=10), gfortran, cmake (>= 2.8.11), 
- libboost-dev (>= 1.47.0), libboost-test-dev, chrpath,
+Build-Depends: debhelper (>=10), 
+ gfortran, 
+ cmake (>= 2.8.11), 
+ libboost-dev (>= 1.47.0), libboost-test-dev, 
+ chrpath,
+ doxygen,
+ swig,
  libeccodes-dev (>= 2.4.1),
- libpython2.7-dev, libnetcdf-dev
-Standards-Version: 4.0.1
+ libopenmpi-dev,
+ libeigen3-dev,
+ libviennacl-dev,
+ libarmadillo-dev
+ libpython2.7-dev, 
+ libnetcdf-dev
+Standards-Version: 4.1.0
 Homepage: https://software.ecmwf.int/wiki/display/EMOS/Emoslib
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/emos.git
 
diff --git a/debian/rules b/debian/rules
index 629e3c0..4b9c689 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,26 +13,20 @@ ARCH:=$(shell dpkg --print-architecture)
 #AUTOGENERATED:= libemos-dev.install libemos-dev.links libemos0d.install
 LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
 
-CMAKE_CLAGS:= \
-		-Dgrib_api_BASE_DIR=/usr \
-		-DECBUILD_LOG_LEVEL=DEBUG \
-		-DENABLE_FFTW=ON \
-		-DENABLE_LITTLE_ENDIAN=$(LITTLE) \
+CMAKE_CFLAGS:= \
 		-DCMAKE_INSTALL_PREFIX=${DESTDIR} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SHARED_LIBS=ON \
-		-DDISABLE_OS_CHECK=ON \
-		-DMCMODEL_FLAGS=${MCMODEL_FLAGS} \
-		-DBUILD_FLAGS=${BUILD_FLAGS} \
-		-DFPIC=${FPIC} \
-		-DINSTALL_LIBDIR=${LIBDIR} \
-		-DINTERPOL_TABLES_PATH=/usr/share/emos \
-		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables \
-		-DTEST_BUFR_TABLES_PATH=${CURDIR}/bufrtables
+		-DENABLE_EIGEN=ON \
+		-DENABLE_NETCDF=ON \
+		-DENABLE_FORTRAN=ON \
+		-DENABLE_PYTHON=ON \
+		-DENABLE_VIENNACL=ON
+
 #	for f in ${AUTOGENERATED} ; do \
 #		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
 #		done
 
 
 override_dh_auto_configure:
-	dh_auto_configure -- 
+	dh_auto_configure --  ${CMAKE_CFLAGS}

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



More information about the debian-science-commits mailing list