From c7bb62290f14c1001964883f6bea805c1a0d01d2 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Mon, 11 Nov 2013 08:50:45 -0600 Subject: [PATCH] error: 'uintptr_t' was not declared in this scope. https://svn.boost.org/trac/boost/ticket/8973 https://svn.boost.org/trac/boost/changeset/84950#file0 --- CMakeModules/download_boost.cmake | 4 +++- patches/boost_cstdint.patch | 12 ++++++++++++ patches/{boost.patch => boost_minkowski.patch} | 2 -- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 patches/boost_cstdint.patch rename patches/{boost.patch => boost_minkowski.patch} (91%) diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake index 1913e1f087..29e775e3d2 100644 --- a/CMakeModules/download_boost.cmake +++ b/CMakeModules/download_boost.cmake @@ -121,7 +121,9 @@ ExternalProject_Add( boost URL_MD5 ${BOOST_MD5} # The patch command executes with the working directory set to - 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. diff --git a/patches/boost_cstdint.patch b/patches/boost_cstdint.patch new file mode 100644 index 0000000000..9a64d95ab5 --- /dev/null +++ b/patches/boost_cstdint.patch @@ -0,0 +1,12 @@ +--- 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. diff --git a/patches/boost.patch b/patches/boost_minkowski.patch similarity index 91% rename from patches/boost.patch rename to patches/boost_minkowski.patch index 8a27dad248..2333b9c8ab 100644 --- a/patches/boost.patch +++ b/patches/boost_minkowski.patch @@ -1,4 +1,3 @@ -=== 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; -