[SCM] OCE packaging branch, debian, updated. debian/0.7.0-3-200-gfd53673
Denis Barbier
bouzim at gmail.com
Fri Feb 24 22:49:49 UTC 2012
The following commit has been merged in the debian branch:
commit 93fb31fae5c65a1086185627835e44f526066974
Author: Denis Barbier <bouzim at gmail.com>
Date: Fri Feb 24 23:21:06 2012 +0100
Add patch to hopefully fix FTBFS on Alpha
Thanks Michael Cree for the report and patch.
Closes: #656838
diff --git a/debian/patches/ftbfs-alpha.patch b/debian/patches/ftbfs-alpha.patch
new file mode 100644
index 0000000..0d991e0
--- /dev/null
+++ b/debian/patches/ftbfs-alpha.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS on Alpha
+ Will be applied upstream if it works as expected.
+Bug: http://bugs.debian.org/656838
+Forwarded: https://github.com/tpaviot/oce/issues/243
+Author: Michael Cree <mcree at orcon.net.nz>
+
+diff --git a/inc/MFT_FileRecord.hxx b/inc/MFT_FileRecord.hxx
+index 0cfd3d8..ba412b7 100644
+--- a/inc/MFT_FileRecord.hxx
++++ b/inc/MFT_FileRecord.hxx
+@@ -47,7 +47,7 @@
+ munmap((caddr_t) mmap_addr,(size_t) mmap_size)
+ #endif // sgi
+
+-#if defined ( __alpha) || defined ( DECOSF1 )
++#if (defined ( __alpha) || defined ( DECOSF1 )) && !defined(linux)
+ #include <sys/mman.h>
+ #define MMAP(file_addr,mmap_size,fildes) \
+ mmap((caddr_t) 0x1000000000,(size_t) mmap_size,PROT_READ, \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..47f564f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ftbfs-alpha.patch
diff --git a/debian/rules b/debian/rules
index 00a568c..e6d5117 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem=cmake --parallel
+ dh $@ --buildsystem=cmake --parallel --with quilt
override_dh_auto_configure:
dh_auto_configure -- \
--
OCE packaging
More information about the debian-science-commits
mailing list