boost/UnpackedTarball_boost.mk | 2 ++
boost/boost.6940.glibc.patch | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
New commits:
commit a6ac5b2a9e4298f7e187dd42eaa8a8587b1693c9
Author: Peter Foley <pefol...@verizon.net>
Date: Mon Nov 5 20:23:54 2012 -0500
fix build with glibc 2.16
Change-Id: Iaa983064dc8643bceb18cba3a2b720b3a5830b78
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index d482077..8035da2 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -28,6 +28,8 @@ boost_patches += boost.mipsbackport.patch
boost_patches += boost.7551.unusedvars.patch
boost_patches += boost.4100.warnings.patch
boost_patches += boost.4510.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/6940
+boost_patches += boost.6940.glibc.patch
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
diff --git a/boost/boost.6940.glibc.patch b/boost/boost.6940.glibc.patch
new file mode 100644
index 0000000..b1f4230
--- /dev/null
+++ b/boost/boost.6940.glibc.patch
@@ -0,0 +1,20 @@
+--- misc/boost_1_44_0/boost/thread/xtime.hpp 2012-11-05 20:13:28.034300778
-0500
++++ misc/build/boost_1_44_0/boost/thread/xtime.hpp 2012-11-05
20:13:50.856322691 -0500
+@@ -20,7 +20,7 @@
+
+ enum xtime_clock_types
+ {
+- TIME_UTC=1
++ TIME_UTC_=1
+ // TIME_TAI,
+ // TIME_MONOTONIC,
+ // TIME_PROCESS,
+@@ -68,7 +68,7 @@
+
+ inline int xtime_get(struct xtime* xtp, int clock_type)
+ {
+- if (clock_type == TIME_UTC)
++ if (clock_type == TIME_UTC_)
+ {
+ *xtp=get_xtime(get_system_time());
+ return clock_type;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
