[cyphesis-cpp] 01/01: Backport fix for link failure on ppc64el with O3 optimization

[Olek Wojnar]

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

olek-guest pushed a commit to branch master
in repository cyphesis-cpp.

commit 97c195a2fd8d50f7809b7a2c8e897cec17167817
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Thu Aug 25 19:37:48 2016 -0400

    Backport fix for link failure on ppc64el with O3 optimization
---
 debian/changelog                                    |  6 ++++++
 debian/patches/explicit-integer-instantiation.patch | 15 +++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7900474..a0fe9b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cyphesis-cpp (0.6.0-6) unstable; urgency=medium
+
+  * Fix link failure on ppc64el with O3 optimization (LP: #1608298)
+
+ -- Olek Wojnar <olek-dev at wojnar.org>  Mon, 29 Aug 2016 22:03:01 -0400
+
 cyphesis-cpp (0.6.0-5) unstable; urgency=high
 
   * Fix error in update-rc.d (Closes: #831878)
diff --git a/debian/patches/explicit-integer-instantiation.patch b/debian/patches/explicit-integer-instantiation.patch
new file mode 100644
index 0000000..cac62ce
--- /dev/null
+++ b/debian/patches/explicit-integer-instantiation.patch
@@ -0,0 +1,15 @@
+Description: Backport fix for link failure on ppc64el with O3 optimization
+ Will not be needed after Cyphesis 0.6.2
+Origin: https://github.com/worldforge/cyphesis/commit/14a054622b64b9c15cf9b69d6e4d348ed096c385
+Last-Update: 2016-08-29
+
+--- a/common/globals.cpp
++++ b/common/globals.cpp
+@@ -166,6 +166,7 @@ int readConfigItem<std::string>(const std::string & section, const std::string &
+ }
+ 
+ template int readConfigItem<bool>(const std::string & section, const std::string & key, bool & storage);
++template int readConfigItem<int>(const std::string & section, const std::string & key, int & storage);
+ 
+ /// \brief Base class for handling varconf options declared inline.
+ class Option {
diff --git a/debian/patches/series b/debian/patches/series
index 56f8a92..d392122 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ man_pages_to_section_6.patch
 add-missing-man-pages.patch
 fix-broken-install-data-hook-target.patch
 do-not-register-with-metaserver.patch
+explicit-integer-instantiation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cyphesis-cpp.git