CVS:oo-deb/debian/patches linux-arm-support.diff,1.2,1.3
Update of /cvs/debian-openoffice/oo-deb/debian/patches
In directory gluck:/tmp/cvs-serv27176/debian/patches
Modified Files:
linux-arm-support.diff
Log Message:
fix boost patch to not include atomic_count_linux.hpp to make sc build
Index: linux-arm-support.diff
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/patches/linux-arm-support.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- linux-arm-support.diff 8 Nov 2004 18:07:46 -0000 1.2
+++ linux-arm-support.diff 10 Nov 2004 15:36:47 -0000 1.3
@@ -2019,3 +2019,19 @@
DLLPOST=.so
+
+Index: boost_1_27_0.patch
+===================================================================
+RCS file: /cvs/external/boost/boost_1_27_0.patch,v
+retrieving revision 1.4.10.5
+diff -u -r1.4.10.5 boost_1_27_0.patch
+--- boost/boost_1_27_0.patch 4 Oct 2004 18:04:11 -0000 1.4.10.5
++++ boost/boost_1_27_0.patch 10 Nov 2004 15:30:13 -0000
+@@ -56,7 +56,7 @@
+
+ #include <boost/detail/atomic_count_win32.hpp>
+
+-! #elif (defined(linux) || defined(__linux) || defined(__linux__)) && !(defined(SPARC) || defined(sparc) || defined(sparc64))
++! #elif (defined(linux) || defined(__linux) || defined(__linux__)) && !(defined(SPARC) || defined(sparc) || defined(sparc64)) && !(defined(ARM) || defined(ARM32))
+
+ #include <boost/detail/atomic_count_linux.hpp>
+
Reply to: