[Debian-iot-packaging] [alljoyn-core-1604] 01/01: Import Debian patch 16.04-4
Thorsten Alteholz
alteholz at moszumanska.debian.org
Tue Oct 11 18:03:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository alljoyn-core-1604.
commit b6fec5809eae066238776faf8f8f1fe6c5f436de
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sun Aug 7 12:31:37 2016 +0200
Import Debian patch 16.04-4
---
debian/changelog | 15 +++++++
debian/liballjoyn1604.install | 1 +
debian/patches/gcc6.patch | 101 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 7 +--
5 files changed, 122 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4defffe..9287fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+alljoyn-core-1604 (16.04-4) unstable; urgency=medium
+
+ * take care of gcc-6 build errors (Closes: #831198)
+ * deactivating gtest for now as it does not work with gcc-6
+ (-> look at #833636)
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sun, 07 Aug 2016 12:31:37 +0200
+
+alljoyn-core-1604 (16.04-3) unstable; urgency=medium
+
+ * put some software for testing the library to
+ /usr/lib/${DEB_HOST_MULTIARCH}/alljoyn/1604/bin
+
+ -- Thorsten Alteholz <debian at alteholz.de> Wed, 29 Jun 2016 22:11:32 +0200
+
alljoyn-core-1604 (16.04-2) unstable; urgency=medium
* add patch to remove -Bsymbolic for creating shared libraries
diff --git a/debian/liballjoyn1604.install b/debian/liballjoyn1604.install
index 4aaf2b7..59e5c4a 100755
--- a/debian/liballjoyn1604.install
+++ b/debian/liballjoyn1604.install
@@ -1,3 +1,4 @@
#! /usr/bin/dh-exec
build/*/*/*/obj/alljoyn_core/liballjoyn.so.* /usr/lib/${DEB_HOST_MULTIARCH}
build/*/*/*/dist/cpp/lib/liballjoyn_about.so.* /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/dist/cpp/bin/* /usr/lib/${DEB_HOST_MULTIARCH}/alljoyn/1604/bin
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
new file mode 100644
index 0000000..9ca2531
--- /dev/null
+++ b/debian/patches/gcc6.patch
@@ -0,0 +1,101 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: take care of compile errors due to gcc-6
+Index: alljoyn-core-1604-16.04/common/src/CryptoSRP.cc
+===================================================================
+--- alljoyn-core-1604-16.04.orig/common/src/CryptoSRP.cc 2016-08-08 16:39:01.000000000 +0200
++++ alljoyn-core-1604-16.04/common/src/CryptoSRP.cc 2016-08-08 16:39:01.000000000 +0200
+@@ -25,7 +25,12 @@
+ #include <algorithm>
+ #include <ctype.h>
+ #include <stdio.h>
+-#include <math.h>
++/* need to change include files, problem occurs with gcc-6 */
++#if __GNUC__ >= 6
++ #include <cmath>
++#else
++ #include <math.h>
++#endif
+
+ #include <qcc/Debug.h>
+ #include <qcc/Crypto.h>
+Index: alljoyn-core-1604-16.04/common/src/SLAPStream.cc
+===================================================================
+--- alljoyn-core-1604-16.04.orig/common/src/SLAPStream.cc 2016-08-08 16:39:01.000000000 +0200
++++ alljoyn-core-1604-16.04/common/src/SLAPStream.cc 2016-08-08 16:39:01.000000000 +0200
+@@ -465,7 +465,7 @@
+ /*
+ * Check that the configuration response is valid.
+ */
+- if (m_linkParams.packetSize > m_linkParams.packetSize) {
++ if (m_linkParams.packetSize > m_linkParams.maxPacketSize) {
+ QCC_LogError(ER_FAIL, ("Configuration failed - device is not configuring link correctly %d %d", m_linkParams.packetSize, m_linkParams.maxPacketSize));
+ m_linkState = LINK_DEAD;
+ return;
+Index: alljoyn-core-1604-16.04/common/src/StringUtil.cc
+===================================================================
+--- alljoyn-core-1604-16.04.orig/common/src/StringUtil.cc 2016-08-08 16:39:01.000000000 +0200
++++ alljoyn-core-1604-16.04/common/src/StringUtil.cc 2016-08-08 16:39:01.000000000 +0200
+@@ -24,7 +24,12 @@
+
+ #include <algorithm>
+ #include <cctype>
+-#include <math.h>
++/* need to change include files, problem occurs with gcc-6 */
++#if __GNUC__ >= 6
++ #include <cmath>
++#else
++ #include <math.h>
++#endif
+
+ #include <qcc/String.h>
+ #include <qcc/StringUtil.h>
+Index: alljoyn-core-1604-16.04/common/crypto/openssl/CryptoAES.cc
+===================================================================
+--- alljoyn-core-1604-16.04.orig/common/crypto/openssl/CryptoAES.cc 2016-08-08 16:39:01.000000000 +0200
++++ alljoyn-core-1604-16.04/common/crypto/openssl/CryptoAES.cc 2016-08-08 16:39:01.000000000 +0200
+@@ -24,7 +24,12 @@
+
+ #include <algorithm>
+ #include <ctype.h>
+-#include <math.h>
++/* need to change include files, problem occurs with gcc-6 */
++#if __GNUC__ >= 6
++ #include <cmath>
++#else
++ #include <math.h>
++#endif
+
+ #include <qcc/String.h>
+ #include <qcc/StringUtil.h>
+Index: alljoyn-core-1604-16.04/alljoyn_core/src/BusAttachment.cc
+===================================================================
+--- alljoyn-core-1604-16.04.orig/alljoyn_core/src/BusAttachment.cc 2016-08-08 16:38:36.000000000 +0200
++++ alljoyn-core-1604-16.04/alljoyn_core/src/BusAttachment.cc 2016-08-08 16:41:45.000000000 +0200
+@@ -2853,9 +2853,13 @@
+ {
+ QStatus status = ER_OK;
+
++/*
++ * applicationStateListener is a reference parameter, so the address is always != nullptr
++ * not the best solution, but the most compatible
+ if (nullptr == &applicationStateListener) {
+ status = ER_INVALID_ADDRESS;
+ }
++*/
+
+ if (ER_OK == status) {
+ status = busInternal->AddApplicationStateListener(applicationStateListener);
+@@ -2873,9 +2877,13 @@
+ {
+ QStatus status = ER_OK;
+
++/*
++ * applicationStateListener is a reference parameter, so the address is always != nullptr
++ * not the best solution, but the most compatible
+ if (nullptr == &applicationStateListener) {
+ status = ER_INVALID_ADDRESS;
+ }
++*/
+
+ if (ER_OK == status) {
+ status = busInternal->RemoveApplicationStateListener(applicationStateListener);
diff --git a/debian/patches/series b/debian/patches/series
index e4d221d..59981ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ hardening.patch
more-native-cpus.patch
remove-build.xml.patch
no-bsymbolic.patch
+gcc6.patch
diff --git a/debian/rules b/debian/rules
index 9665220..a28585c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
-export GTEST_DIR=/usr/src/gtest
+#XXX deactivate test for now: export GTEST_DIR=/usr/src/gtest
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -22,7 +22,8 @@ OS=linux
export VERSION := 16.04
export SONAME := 1604
export VARIANT := release
-export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR)
+#XXX deactivate test for now: export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR)
+export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1
export BUILD_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/dist
export OBJ_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/obj
@@ -79,7 +80,7 @@ override_dh_auto_clean:
dh_auto_clean
override_dh_auto_test:
- ./build/$(OS)/$(CPU)/$(VARIANT)/test/cpp/bin/cmtest
+ #XXX deactivate test for now: ./build/$(OS)/$(CPU)/$(VARIANT)/test/cpp/bin/cmtest
dh_auto_test
override_dh_installchangelogs:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-core-1604.git
More information about the Debian-iot-packaging
mailing list