[emos] 04/06: * debian/rules: Use dpkg-architecture go get list of little-endian archs on which we don't run tests, instead of hard-coded list. * Avoid chrpath -d on non-ELF binaries

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit 9ad6a1e2af15b1d6e876fd193bfb8068d3009d6f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 7 23:02:58 2016 +0100

    * debian/rules: Use dpkg-architecture go get list of little-endian archs
      on which we don't run tests, instead of hard-coded list.
    * Avoid chrpath -d on non-ELF binaries
---
 debian/changelog |  7 +++++--
 debian/rules     | 12 ++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0e61ff..f5bc843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-emoslib (2:4.4.2-1) UNRELEASED; urgency=medium
+emoslib (2:4.4.2-1) unstable; urgency=medium
 
   * New upstream release.
+  * debian/rules: Use dpkg-architecture go get list of little-endian archs
+    on which we don't run tests, instead of hard-coded list.
+  * Avoid chrpath -d on non-ELF binaries
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Jul 2016 21:43:28 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Jul 2016 23:02:46 +0100
 
 emoslib (2:4.4.1-5) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 039053b..aa4e6d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,7 @@ CMAKE_DIR:=debian/tmp/share/libemos/cmake
 DO_TEST:=true
 
 # Do tests on little-endian only for the moment;
-BIGENDIAN_LIST:= "s390x mips sparc powerpc sparc64"
-ifneq (,$(findstring $(ARCH),$(BIGENDIAN_LIST)))
-  LITTLE:= false
-else
-  LITTLE:= true
-endif
+ENDIAN:=$(shell dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
 
 FPIC_LIST:= "s390x amd64 ppc64el m68k sparc64"
 ifneq (,$(findstring $(ARCH),$(FPIC_LIST)))
@@ -50,7 +45,7 @@ endif
 override_dh_auto_test:
 	# Need links for tests.
 	(cd bufrtables && sh ./links.sh)
-	 $(LITTLE) && dh_auto_test || echo "Tests disabled on bigendian systems for the moment"
+	 $(ENDIAN)==little && dh_auto_test || echo "Tests disabled on bigendian systems for the moment"
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
@@ -86,7 +81,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	cd obj-* && $(MAKE) install
-	chrpath -d debian/tmp/bin/*
+	for d in debian/tmp/bin/* ; do \
+		( chrpath -d $$d || echo "Ignoring non-ELF file errors") ; done
 	chrpath -d debian/tmp/lib/*.0d
 	(cd ${DESTDIR}/share/libemos/tables/bufrtables && sh ./links.sh)
 	dh_auto_install	

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