[Pkg-mongodb-maintainers] [mongo-cxx-driver-legacy] 01/02: Add patch to fix FTBFS on mips{, el}

[László Böszörményi]

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

gcs pushed a commit to branch debian
in repository mongo-cxx-driver-legacy.

commit 81515d11d5d18bec070241db74d4bc2e71a4bee1
Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
Date:   Mon Nov 28 20:21:45 2016 +0000

    Add patch to fix FTBFS on mips{,el}
---
 debian/changelog                                 |  7 ++++
 debian/patches/2002_add-latomic-for-mips32.patch | 45 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ff298f2..1240062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mongo-cxx-driver-legacy (1.1.2-4) UNRELEASED; urgency=medium
+
+  [ Radovan Birdic <Radovan.Birdic at imgtec.com> ]
+  * Add patch to fix FTBFS on mips{,el}.
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.org>  Mon, 28 Nov 2016 18:20:18 +0100
+
 mongo-cxx-driver-legacy (1.1.2-3) unstable; urgency=medium
 
   * Fix self-tests FTBFS with adding tzdata to build depends (closes: #844953).
diff --git a/debian/patches/2002_add-latomic-for-mips32.patch b/debian/patches/2002_add-latomic-for-mips32.patch
new file mode 100644
index 0000000..cff0a89
--- /dev/null
+++ b/debian/patches/2002_add-latomic-for-mips32.patch
@@ -0,0 +1,45 @@
+--- mongo-cxx-driver-legacy-1.1.2.orig/SConstruct
++++ mongo-cxx-driver-legacy-1.1.2/SConstruct
+@@ -686,7 +686,10 @@ if darwin:
+ elif linux:
+ 
+     env.Append( LIBS=['m'] )
+-
++    
++    if 'mips' in os.uname()[4] and '32bit' in py_platform.architecture():
++        env.Append( LIBS=['atomic'] )
++	
+     if os.uname()[4] == "x86_64" and not force32:
+         linux64 = True
+         nixLibPrefix = "lib64"
+@@ -1597,7 +1600,7 @@ def doConfigure(myenv):
+         test_body = """
+         #include <atomic>
+         int main(int argc, char **argv) {
+-            std::atomic<int> a(0);
++            std::atomic<long long> a(0);
+             return a.fetch_add(1);
+         }
+         """
+@@ -1609,9 +1612,9 @@ def doConfigure(myenv):
+     def CheckGCCAtomicBuiltins(context):
+         test_body = """
+         int main(int argc, char **argv) {
+-            int a = 0;
+-            int b = 0;
+-            int c = 0;
++            long long a = 0;
++            long long b = 0;
++            long long c = 0;
+ 
+             __atomic_compare_exchange(&a, &b, &c, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
+             return 0;
+@@ -1625,7 +1628,7 @@ def doConfigure(myenv):
+     def CheckGCCSyncBuiltins(context):
+         test_body = """
+         int main(int argc, char **argv) {
+-            int a = 0;
++            long long a = 0;
+             return __sync_fetch_and_add(&a, 1);
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 358e37a..db78a2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 1003_C++11_compat.patch
 1004_fix_ftbfs_with_gcc6.1.patch
 2001_use_system_libraries_if_possible.patch
+2002_add-latomic-for-mips32.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/mongo-cxx-driver-legacy.git