[Debian-iot-packaging] [alljoyn-core-1504] 01/01: Imported Debian patch 15.04b-4

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository alljoyn-core-1504.

commit 25725e8e8d786263456ef0a54a6894b1c5b931b1
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Mon Jun 13 19:28:32 2016 +0200

    Imported Debian patch 15.04b-4
---
 debian/changelog                      | 13 +++++++++++++
 debian/patches/more-native-cpus.patch |  2 +-
 debian/rules                          | 20 +++++++++++---------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dc56f5..029b9b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+alljoyn-core-1504 (15.04b-4) unstable; urgency=medium
+
+  * debian/rules: there still is i386 available, so map all i.86 to x86
+                  (Closes: #826766) thanks to Adam Conrad for the patch
+  * debian/rules: remove build_core/conf/linux/arm as it is only used 
+		  for Alljoyn-arm and cross compiling
+                  thanks to Adam Conrad for the patch
+  * debian/rules: allow sh4 as native architecture
+                  (so finally: Closes: #825218)
+                  thanks to Aaron M. Ucko for his suggestions
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Mon, 13 Jun 2016 19:28:32 +0200
+
 alljoyn-core-1504 (15.04b-3) unstable; urgency=medium
 
   * add some more architectures
diff --git a/debian/patches/more-native-cpus.patch b/debian/patches/more-native-cpus.patch
index 2af3dc3..8b588fb 100644
--- a/debian/patches/more-native-cpus.patch
+++ b/debian/patches/more-native-cpus.patch
@@ -9,7 +9,7 @@ Index: alljoyn-core-1504-15.04b/build_core/SConscript
      else:
          default_target_cpu = 'x86'
 -    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt')
-+    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt', 's390x', 'aarch64', 'arm64', 'armhf', 'i386', 'mips', 'mipsel', 'powerpc', 'powerpc64le', 'alpha', 'hppa', 'm68k', 'mips64el', 'powerpcspe', 'powerpc64', 'sparc64')
++    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt', 's390x', 'aarch64', 'arm64', 'armhf', 'i386', 'mips', 'mipsel', 'powerpc', 'powerpc64le', 'alpha', 'hppa', 'm68k', 'mips64el', 'powerpcspe', 'powerpc64', 'sh4', 'sparc64')
  
      default_msvc_version = None
  
diff --git a/debian/rules b/debian/rules
index 2529236..44a8a29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,17 +10,13 @@ export GTEST_DIR=/usr/src/gtest
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-# mapping i386 to x86 for Alljoyn
-ifeq ($(CPU),i686) 
+# mapping all i.86 to x86 for Alljoyn
+CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU | sed -e 's/i.86/x86/')
+BUILDARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# in case of X32, we might want to set x86 as well
+ifeq ($(BUILDARCH),x32) 
   export CPU = "x86"
 endif
-# we need to check the CPU and do not conflict with
-# the already existing "arm" for cross compiling
-# TODO: check whether this is ok for armel and armhf
-ifeq ($(CPU),arm) 
-  export CPU = "armhf"
-endif
 OS=linux
 
 export VERSION := 15.04b
@@ -62,6 +58,12 @@ override_dh_auto_build:
 	dh_auto_build
 
 override_dh_auto_clean:
+	# see explanation of -I for dpkg-source
+	# as this dir contains an {arch}, dpkg-source ignores it
+	# "arm" in Alljoyn world means openWRT+cross compiling
+	# so this is not needed for Debian
+	rm -rf build_core/conf/linux/arm
+	# these files are created during build
 	rm -f .sconsign.dblite
 	rm -rf .sconf_temp
 	rm -f config.log

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-core-1504.git