diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-06-04 16:30:00 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-06-04 16:30:27 +0200 |
| commit | 2195b65c2106b529af833eca2c0f59674a299415 (patch) | |
| tree | fe06db7d45049d6319e14b4aabbda17af6983a54 /libcmis | |
| parent | 70a6a4d425558340bb49507975343a3e0a1bdde8 (diff) | |
libcmis: fix for windows build
Change-Id: Ibc600ce33bd59b3fd2d5ff29c5fb19710dc0df8f
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/boost-win.patch | 59 | ||||
| -rw-r--r-- | libcmis/makefile.mk | 4 |
2 files changed, 63 insertions, 0 deletions
diff --git a/libcmis/boost-win.patch b/libcmis/boost-win.patch new file mode 100644 index 000000000000..02188c07d4a8 --- /dev/null +++ b/libcmis/boost-win.patch @@ -0,0 +1,59 @@ +--- misc/libcmis-0.2.1/src/libcmis/atom-object.cxx 2012-06-01 07:44:26.000000000 -0600 ++++ misc/build/libcmis-0.2.1/src/libcmis/atom-object.cxx 2012-06-04 07:52:24.131190200 -0600 +@@ -29,6 +29,9 @@ + #include <algorithm> + #include <sstream> + ++#ifndef BOOST_DATE_TIME_NO_LIB ++#define BOOST_DATE_TIME_NO_LIB ++#endif + #include <boost/date_time/posix_time/posix_time.hpp> + + #include "atom-object.hxx" +--- misc/libcmis-0.2.1/src/libcmis/object.hxx 2012-06-01 07:38:36.000000000 -0600 ++++ misc/build/libcmis-0.2.1/src/libcmis/object.hxx 2012-06-04 07:52:21.900386200 -0600 +@@ -32,6 +32,9 @@ + #include <map> + #include <string> + ++#ifndef BOOST_DATE_TIME_NO_LIB ++#define BOOST_DATE_TIME_NO_LIB ++#endif + #include <boost/date_time.hpp> + #include <boost/shared_ptr.hpp> + +--- misc/libcmis-0.2.1/src/libcmis/property-type.hxx 2012-02-17 08:00:50.000000000 -0700 ++++ misc/build/libcmis-0.2.1/src/libcmis/property-type.hxx 2012-06-04 07:52:17.157977900 -0600 +@@ -28,6 +28,9 @@ + #ifndef _PROPERTY_TYPE_HXX_ + #define _PROPERTY_TYPE_HXX_ + ++#ifndef BOOST_DATE_TIME_NO_LIB ++#define BOOST_DATE_TIME_NO_LIB ++#endif + #include <boost/date_time.hpp> + #include <libxml/tree.h> + +--- misc/libcmis-0.2.1/src/libcmis/property.hxx 2012-02-17 06:38:33.000000000 -0700 ++++ misc/build/libcmis-0.2.1/src/libcmis/property.hxx 2012-06-04 07:52:19.388781800 -0600 +@@ -31,6 +31,9 @@ + #include <libxml/tree.h> + #include <libxml/xmlwriter.h> + ++#ifndef BOOST_DATE_TIME_NO_LIB ++#define BOOST_DATE_TIME_NO_LIB ++#endif + #include <boost/date_time.hpp> + #include <boost/shared_ptr.hpp> + +--- misc/libcmis-0.2.1/src/libcmis/xml-utils.hxx 2012-05-30 06:17:12.000000000 -0600 ++++ misc/build/libcmis-0.2.1/src/libcmis/xml-utils.hxx 2012-06-04 07:52:10.621566400 -0600 +@@ -30,6 +30,9 @@ + + #include <string> + ++#ifndef BOOST_DATE_TIME_NO_LIB ++#define BOOST_DATE_TIME_NO_LIB ++#endif + #include <boost/date_time.hpp> + #include <libxml/tree.h>
\ No newline at end of file diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk index 4657202821e7..f42fe73845aa 100644 --- a/libcmis/makefile.mk +++ b/libcmis/makefile.mk @@ -44,6 +44,10 @@ TARGET=cmis TARFILE_NAME=libcmis-0.2.1 TARFILE_MD5=aba670de3beaafac1e287a9399dcc023 +.IF "$(OS)$(COMP)" == "WNTMSC" +PATCH_FILES+=boost-win.patch +.ENDIF + .IF "$(debug)" != "" CFLAGS+=-g .ELSE |