[Debian-astro-commits] [gyoto] 01/05: Compile the LORENE plugin

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch lorene
in repository gyoto.

commit 3ead3724a2adb18260cf3b4da087c527549d9a8f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Sep 20 20:36:43 2016 +0200

    Compile the LORENE plugin
---
 debian/changelog               | 1 +
 debian/control                 | 2 +-
 debian/install_for_all_pythons | 2 +-
 debian/rules                   | 9 ++++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffd4f40..0b4e8b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gyoto (1.1.0-2) UNRELEASED; urgency=low
 
   * Add Multi-Arch field for each binary package
+  * Compile LORENE plug-in
 
  -- Thibaut Paumard <thibaut at debian.org>  Tue, 20 Sep 2016 15:53:18 +0200
 
diff --git a/debian/control b/debian/control
index cb9116c..04857f1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9~), yorick-dev, yorick-yutils,
 	       mpi-default-dev, dh-python, python-all-dev (>= 2.6.6-3~),
 	       python-setuptools, python3-all-dev, python3-setuptools,
 	       swig3.0, python-numpy, python3-numpy, doxygen, dh-exec (>=0.3),
-	       pkg-config
+	       pkg-config, liblorene-dev, lorene-codes-src
 Build-Depends-Indep: doxygen-latex,
                texlive-bibtex-extra, texlive-latex-base,
                texlive-lang-french, tipa
diff --git a/debian/install_for_all_pythons b/debian/install_for_all_pythons
index 8950c2a..53dd313 100644
--- a/debian/install_for_all_pythons
+++ b/debian/install_for_all_pythons
@@ -3,7 +3,7 @@ set -e
 cd python
 for pytag in "" 3 ; do
  for python in `py${pytag}versions -s`; do
-  for component in "" _std ; do
+  for component in "" _std _lorene; do
    $python setup${component}.py install --install-layout=deb --root=../debian/python${pytag}-gyoto ;
   done ;
  done ;
diff --git a/debian/rules b/debian/rules
index 3ba5078..1f8f499 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,11 @@
 export DH_OPTIONS
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Hardened flags
-export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+# LORENE has a couple of undefined symbols, we can't use bindnow until this is fixed
+# export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
@@ -22,7 +24,8 @@ export DEB_GYOTO_SOVERS
 configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
 	--without-lorene --enable-static --enable-shared \
 	--with-boost --enable-c++11 --enable-release \
-	--with-mpi --without-virtualenv --enable-doc
+	--with-mpi --without-virtualenv --enable-doc \
+	--with-lorene=/usr/lib/$(DEB_HOST_MULTIARCH)/lorene
 
 %:
 	dh $@ --with python2,python3,autoreconf
@@ -91,7 +94,7 @@ override_dh_auto_test-arch:
 ifeq (,$(filter $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64 mips))
 # skip the test suite on kfreebsd-any as gyoto package not beeing built
 # skip on mips as lucatelli2 fails on it (but the binary works on other boxes)
-	LC_ALL=C.UTF-8 dh_auto_test
+	LC_ALL=C.UTF-8 dh_auto_test -- check-lorene
 endif
 
 override_dh_strip:

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