[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-3-2-gccf93e9

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=ccf93e9

The following commit has been merged in the master branch:
commit ccf93e94c98a17bd725a5ed9b86b6f0a2ee4b454
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 8 21:44:40 2014 +0400

    Add a patch to not hardcode the linker hash style.
---
 debian/changelog                |  2 ++
 debian/patches/no_gnu_hash.diff | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6adf581..752e016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.3.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch to not hardcode the linker hash style.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:37:12 +0400
 
diff --git a/debian/patches/no_gnu_hash.diff b/debian/patches/no_gnu_hash.diff
new file mode 100644
index 0000000..31bfac2
--- /dev/null
+++ b/debian/patches/no_gnu_hash.diff
@@ -0,0 +1,16 @@
+Description: do not hardcode hash style
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug: https://bugreports.qt-project.org/browse/QBS-696
+Forwarded: not-needed
+Last-Update: 2014-10-08
+
+--- a/share/qbs/modules/cpp/GenericGCC.qbs
++++ b/share/qbs/modules/cpp/GenericGCC.qbs
+@@ -121,7 +121,6 @@
+             args.push('-shared');
+             if (product.moduleProperty("qbs", "targetOS").contains('linux')) {
+                 args = args.concat([
+-                    '-Wl,--hash-style=gnu',
+                     '-Wl,--as-needed',
+                     '-Wl,-soname=' + UnixUtils.soname(product, lib.fileName)
+                 ]);
diff --git a/debian/patches/series b/debian/patches/series
index e20fb9d..0cfb38f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 endianness.diff
 skip_test.diff
+no_gnu_hash.diff

-- 
qbs packaging