[Debian-iot-packaging] [alljoyn-core-1509] 01/01: Imported Debian patch 15.09a-2

[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-1509.

commit 01c2cf038d1e3d7bd0751c31cda83df8b77c45f2
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Wed Jun 22 19:28:32 2016 +0200

    Imported Debian patch 15.09a-2
---
 debian/changelog                  |  7 +++++++
 debian/patches/no-bsymbolic.patch | 17 +++++++++++++++++
 debian/patches/series             |  1 +
 debian/patches/time.patch         |  4 ++--
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72cbf25..ec76848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alljoyn-core-1509 (15.09a-2) unstable; urgency=medium
+
+  * add patch to remove -Bsymbolic for creating shared libraries
+    with soname
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Wed, 22 Jun 2016 19:28:32 +0200
+
 alljoyn-core-1509 (15.09a-1) unstable; urgency=medium
 
   * Initial release (Closes: #827205)
diff --git a/debian/patches/no-bsymbolic.patch b/debian/patches/no-bsymbolic.patch
new file mode 100644
index 0000000..5d1ca0e
--- /dev/null
+++ b/debian/patches/no-bsymbolic.patch
@@ -0,0 +1,17 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: scons automatically add '-Wl,-Bsymbolic' which results in
+             segmentation faults for Debug-calls
+             so better don't use that linker option
+Index: alljoyn-core-1509-15.09a/build_core/conf/linux/SConscript
+===================================================================
+--- alljoyn-core-1509-15.09a.orig/build_core/conf/linux/SConscript	2016-06-22 20:25:36.000000000 +0200
++++ alljoyn-core-1509-15.09a/build_core/conf/linux/SConscript	2016-06-22 20:25:36.000000000 +0200
+@@ -69,6 +69,8 @@
+ 
+ env.Append(LINKFLAGS = ['-z', 'relro', '-z', 'now'])
+ 
++env['SHLIBVERSIONFLAGS'] = " "
++
+ # Debug/Release Variants
+ if env['VARIANT'] == 'debug':
+    env.Append(CFLAGS = '-g')
diff --git a/debian/patches/series b/debian/patches/series
index 081f2eb..55c90e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ hardening.patch
 more-native-cpus.patch
 remove-build.xml.patch
 time.patch
+no-bsymbolic.patch
diff --git a/debian/patches/time.patch b/debian/patches/time.patch
index 87995bb..6c43241 100644
--- a/debian/patches/time.patch
+++ b/debian/patches/time.patch
@@ -7,8 +7,8 @@ Description: patch cherry picked from upstream
    -> https://git.allseenalliance.org/gerrit/#/c/7559/
 Index: alljoyn-core-1509-15.09a/common/os/posix/time.cc
 ===================================================================
---- alljoyn-core-1509-15.09a.orig/common/os/posix/time.cc	2016-06-13 14:39:59.000000000 +0200
-+++ alljoyn-core-1509-15.09a/common/os/posix/time.cc	2016-06-13 14:43:33.000000000 +0200
+--- alljoyn-core-1509-15.09a.orig/common/os/posix/time.cc	2016-06-22 20:24:48.000000000 +0200
++++ alljoyn-core-1509-15.09a/common/os/posix/time.cc	2016-06-22 20:24:48.000000000 +0200
 @@ -140,14 +140,16 @@
  }
  

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