Package: alljoyn-core-1504
Version: 15.04b-3
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Use same logic as alljoyn-services for x86 and ARM.
This patch makes more sense in the context of Bug#826765, which has a
dependency on this one (due to building with 'arm' as a target, which
only works with the 'rm -rf' in this patch).
It also simplifies and corrects the x86 bits to match what I did in
the other bug's patch, as all i*86 should be considered x86, not just
i686.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru alljoyn-core-1504-15.04b/debian/rules alljoyn-core-1504-15.04b/debian/rules
--- alljoyn-core-1504-15.04b/debian/rules 2016-06-03 00:23:49.000000000 -0600
+++ alljoyn-core-1504-15.04b/debian/rules 2016-06-07 09:20:45.000000000 -0600
@@ -10,17 +10,7 @@
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)
- 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
+CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU | sed -e 's/i.86/x86/')
OS=linux
export VERSION := 15.04b
@@ -62,6 +52,7 @@
dh_auto_build
override_dh_auto_clean:
+ rm -rf build_core/conf/linux/arm
rm -f .sconsign.dblite
rm -rf .sconf_temp
rm -f config.log
