Commit c7bb6229 authored by Dick Hollenbeck's avatar Dick Hollenbeck
parent a3c02bc3
......@@ -121,7 +121,9 @@ ExternalProject_Add( boost
URL_MD5 ${BOOST_MD5}
# The patch command executes with the working directory set to <SOURCE_DIR>
PATCH_COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
PATCH_COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost_minkowski.patch"
# PATCH_COMMAND continuation (any *_COMMAND here can be continued with COMMAND):
COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost_cstdint.patch"
# [Mis-]use this step to erase all the boost headers and libraries before
# replacing them below.
......
--- boost/cstdint.hpp
+++ boost/cstdint.hpp
@@ -42,5 +42,8 @@
// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
//
-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
+#if defined(BOOST_HAS_STDINT_H) \
+ && (!defined(__GLIBC__) \
+ || defined(__GLIBC_HAVE_LONG_LONG) \
+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
// The following #include is an implementation artifact; not part of interface.
=== modified file 'boost/polygon/detail/minkowski.hpp'
--- boost/polygon/detail/minkowski.hpp 2013-05-31 02:24:16 +0000
+++ boost/polygon/detail/minkowski.hpp 2013-05-31 02:26:26 +0000
@@ -30,13 +30,13 @@
......@@ -17,4 +16,3 @@
point prev_b = *bb;
itrT2 tmpb = bb;
++tmpb;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment