[odb-api] 05/14: Set DISABLE_OS_CHECK=On. Closes: #880681

[Alastair McKinstry]

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 8bb8ae00a4254c1d90dfbad5e99560f59f1777e8
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Nov 4 17:25:34 2017 +0000

    Set DISABLE_OS_CHECK=On. Closes: #880681
---
 debian/changelog      | 2 +-
 debian/patches/series | 1 +
 debian/rules          | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 295570e..5aacc4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 odb-api (0.17.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
-    - DFSG release is free of contrib .bin files for c++ (not needed)
   * Standards-Version: 4.1.1
   * Now require libeccodes-dev >= 2.5.0
   * Add ksh depenendency for libodb-api-bin
+  * Set DISABLE_OS_CHECK=On. Closes: #880681
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 03 Nov 2017 13:28:15 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index ddf6c5d..4ba8d87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 #unique_ptr.patch
+python-multiarch.patch
 shared_lib.patch
 python3.patch
 py3-port.patch
diff --git a/debian/rules b/debian/rules
index 8648c7a..5ff9ce1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ CMAKE_DIR_ODBAPI:=debian/tmp/usr/share/odb_api/cmake
 
 CMAKE_CFLAGS:= \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DDISABLE_OS_CHECK=ON \
 		-DBUILD_SHARED_LIBS=ON \
 		-DENABLE_EIGEN=ON \
 		-DENABLE_NETCDF=ON \
@@ -52,3 +53,7 @@ override_dh_auto_install:
 		sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' | \
 		sed -e 	's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' > ${CMAKE_DIR_ODBAPI}/tmp
 	mv ${CMAKE_DIR_ODBAPI}/tmp ${CMAKE_DIR_ODBAPI}/odb_api-targets-release.cmake
+	# Sanitise paths for bit reproducibility
+	cat ${CMAKE_DIR_ODBAPI}/odb_api-config.cmake | \
+		sed -e 's%${CURDIR}%/build/odb-api%g' > ${CMAKE_DIR_ODBAPI}/tmp
+	mv ${CMAKE_DIR_ODBAPI}/tmp ${CMAKE_DIR_ODBAPI}/odb_api-config.cmake

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