[oce] 01/03: New patch: debian/patches/NCollection-align-64bit.patch
Denis Barbier
barbier-guest at moszumanska.debian.org
Wed Nov 27 20:48:35 UTC 2013
This is an automated email from the git hooks/post-receive script.
barbier-guest pushed a commit to branch debian
in repository oce.
commit f36a96f2cfebbbdd159cf29c2e02cc303ca6b529
Author: Denis Barbier <bouzim at gmail.com>
Date: Tue Nov 26 22:09:06 2013 +0100
New patch: debian/patches/NCollection-align-64bit.patch
Align words on 64 bit. This fixes FTBFS on mips, mipsel and sparc.
---
debian/patches/NCollection-align-64bit.patch | 30 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 31 insertions(+)
diff --git a/debian/patches/NCollection-align-64bit.patch b/debian/patches/NCollection-align-64bit.patch
new file mode 100644
index 0000000..a1d44c0
--- /dev/null
+++ b/debian/patches/NCollection-align-64bit.patch
@@ -0,0 +1,30 @@
+Description: Fix FTBFS on mips, mipsel and sparc
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: no
+Last-Update: 2013-11-24
+
+A similar fix had already been applied upstream for HP-UX.
+
+Index: oce/src/NCollection/NCollection_IncAllocator.hxx
+===================================================================
+--- oce.orig/src/NCollection/NCollection_IncAllocator.hxx
++++ oce/src/NCollection/NCollection_IncAllocator.hxx
+@@ -24,6 +24,8 @@
+
+ #include <NCollection_BaseAllocator.hxx>
+
++#include <inttypes.h>
++
+ /**
+ * Class NCollection_IncAllocator - incremental memory allocator. This class
+ * allocates memory on request returning the pointer to an allocated
+@@ -43,7 +45,7 @@
+ {
+ public:
+ // The type defining the alignement of allocated objects
+- typedef void * aligned_t;
++ typedef uint64_t aligned_t;
+
+ // ---------- PUBLIC METHODS ----------
+
diff --git a/debian/patches/series b/debian/patches/series
index 1122866..9ee0ec2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
split-export.patch
+NCollection-align-64bit.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git
More information about the debian-science-commits
mailing list