diff options
Diffstat (limited to 'databases/mysql57-client/patches/patch-cmake_boost.cmake')
| -rw-r--r-- | databases/mysql57-client/patches/patch-cmake_boost.cmake | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/databases/mysql57-client/patches/patch-cmake_boost.cmake b/databases/mysql57-client/patches/patch-cmake_boost.cmake index 9d3ca940e24..e142f7f9ad0 100644 --- a/databases/mysql57-client/patches/patch-cmake_boost.cmake +++ b/databases/mysql57-client/patches/patch-cmake_boost.cmake @@ -1,49 +1,20 @@ -$NetBSD: patch-cmake_boost.cmake,v 1.10 2018/12/13 19:51:45 adam Exp $ +$NetBSD: patch-cmake_boost.cmake,v 1.10.6.1 2019/08/10 13:12:45 bsiegert Exp $ -Fix to use a newer version of Boost. +Allow newer Boost. ---- cmake/boost.cmake.orig 2017-06-22 14:13:19.000000000 +0000 +--- cmake/boost.cmake.orig 2019-04-13 13:32:15.000000000 +0000 +++ cmake/boost.cmake -@@ -13,7 +13,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --# We want boost 1.59.0 in order to build our boost/geometry code. -+# We want boost 1.69.0 in order to build our boost/geometry code. - # The boost tarball is fairly big, and takes several minutes - # to download. So we recommend downloading/unpacking it - # only once, in a place visible from any bzr sandbox. -@@ -31,10 +31,10 @@ - # we assume that the correct version (see below) - # is installed on the compile host in the standard location. - --SET(BOOST_PACKAGE_NAME "boost_1_59_0") -+SET(BOOST_PACKAGE_NAME "boost_1_69_0") - SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz") - SET(BOOST_DOWNLOAD_URL -- "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}" -+ "http://sourceforge.net/projects/boost/files/boost/1.69.0/${BOOST_TARBALL}" - ) - - SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0") -@@ -244,7 +244,7 @@ ENDIF() - # // BOOST_VERSION % 100 is the patch level - # // BOOST_VERSION / 100 % 1000 is the minor version - # // BOOST_VERSION / 100000 is the major version --# #define BOOST_VERSION 105900 -+# #define BOOST_VERSION 106900 - FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp" - BOOST_VERSION_NUMBER - REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*" -@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) +@@ -262,12 +262,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) COULD_NOT_FIND_BOOST() ENDIF() -IF(NOT BOOST_MINOR_VERSION EQUAL 59) -+IF(NOT BOOST_MINOR_VERSION EQUAL 69) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " +- MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 59" -+ "we need 69" - ) - COULD_NOT_FIND_BOOST() - ENDIF() +- ) +- COULD_NOT_FIND_BOOST() +-ENDIF() ++ + + MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}") + |