[oce] 02/03: New patch: debian/patches/fix-FTBFS-armel.patch

[Denis Barbier]

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

barbier-guest pushed a commit to branch debian
in repository oce.

commit f9ab04f77806bf49a45ef1898f97e918cb4bacdf
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Nov 26 22:19:57 2013 +0100

    New patch: debian/patches/fix-FTBFS-armel.patch
---
 debian/patches/fix-FTBFS-armel.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/fix-FTBFS-armel.patch b/debian/patches/fix-FTBFS-armel.patch
new file mode 100644
index 0000000..a6d3511
--- /dev/null
+++ b/debian/patches/fix-FTBFS-armel.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS on Armel
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: no
+Last-Update: 2013-11-24
+
+This change comes from commit 7495ddcac09e7dcd4601809659df06e12701090c
+
+    Revert f32f5d3, atomic operations are mandatory in multithread
+
+    In monothread, compile with -DIGNORE_NO_ATOMICS flag.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7c13187..14dca15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -220,6 +220,10 @@ else ()
+ 	set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "_DEBUG")
+ endif (OCE_ENABLE_DEB_FLAG)
+ 
++if(OCE_MULTITHREAD_LIBRARY STREQUAL "NONE")
++    add_definitions(-DIGNORE_NO_ATOMICS)
++endif (OCE_MULTITHREAD_LIBRARY STREQUAL "NONE")
++
+ #
+ # Check components dependencies
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 9ee0ec2..e3297c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 split-export.patch
 NCollection-align-64bit.patch
+fix-FTBFS-armel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git