[odb-api] 14/14: Delete ecbuild configuartion info from include files that break multi-arch usability and reproducibility

[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 fa37fd5df918a8248067da18e3982e21e7ee899a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Nov 5 16:22:47 2017 +0000

    Delete ecbuild configuartion info from include files that break multi-arch usability and reproducibility
---
 debian/changelog |  7 +++++++
 debian/rules     | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index de5620e..efbb2e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+odb-api (0.17.4-2) UNRELEASED; urgency=medium
+
+  * Delete ecbuild configuartion info from include files that break
+    multi-arch usability and reproducibility
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 05 Nov 2017 16:22:05 +0000
+
 odb-api (0.17.4-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 5ff9ce1..34159ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
-#!/usr/bin/make -f
+#
+## Delete files that break reproducibility§!/usr/bin/make -f
 
 export DH_VERBOSE=1
 
@@ -13,6 +14,7 @@ DESTDIR:=$(shell pwd)/debian/tmp
 
 CMAKE_DIR_ECKIT:=debian/tmp/usr/share/eckit/cmake
 CMAKE_DIR_ODBAPI:=debian/tmp/usr/share/odb_api/cmake
+INC_DIR:=debian/tmp/usr/include
 
 CMAKE_CFLAGS:= \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -57,3 +59,17 @@ override_dh_auto_install:
 	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
+	# Delete files that break reproducibility, and refs from include files
+	rm -f ${INC_DIR}/odb_api/odb_api_ecbuild_config.h \
+		${INC_DIR}/eckit/eckit_ecbuild_config.h   \
+		${INC_DIR}/metkit/metkit_ecbuild_config.h 
+	grep -v odb_api_ecbuild_config.h ${INC_DIR}/odb_api/odb_api_config.h |
+		grep -v ODB_API_BINARY_DIR > ${INC_DIR}/tmp
+	mv ${INC_DIR}/tmp ${INC_DIR}/odb_api/odb_api_config.h
+	grep -v eckit_ecbuild_config.h ${INC_DIR}/eckit/eckit_config.h |
+		grep -v ECKIT_BUILD_DIR > ${INC_DIR}/tmp
+	mv ${INC_DIR}/tmp ${INC_DIR}/eckit/eckit_config.h
+	grep -v metkit_ecbuildconfig.h ${INC_DIR}/metkit_config.h > ${INC_DIR}/tmp
+	mv ${INC_DIR}/tmp ${INC_DIR}/metkit/metkit_config.h
+
+

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