From 5b26e9da5f46afbcc8ff32c87389cd684c2d501a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Sun, 21 Apr 2019 18:04:27 +0200 Subject: [PATCH] Update Boost requirements for Linux build This is forced by incompatiblity between JSON for Modern C++ and Boost.Threads up to 1.64, as used by Poedit's code. See https://github.com/nlohmann/json/issues/610 --- .travis.yml | 1 + README | 2 +- configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7df1054212..afd24eafed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ addons: sources: - ubuntu-toolchain-r-test - sourceline: 'ppa:vslavik/poedit' + - sourceline: 'ppa:mhier/libboost-latest' packages: - gcc-6 - g++-6 diff --git a/README b/README index d8effe5cc1..72add1c56b 100644 --- a/README +++ b/README @@ -31,7 +31,7 @@ Most Linux distributions also include native Poedit packages. Requirements: - * Boost + * Boost >= 1.65 * Unicode build of wxWidgets library, version >= 3.0.3 (see http://www.wxwidgets.org) * ICU * LucenePlusPlus diff --git a/configure.ac b/configure.ac index 4783d4117f..6e5275193f 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ yes) DEBUG_FLAGS="-g -Wall -O0" esac -AX_BOOST_BASE([1.60], [], [AC_MSG_ERROR([Boost libraries are required])]) +AX_BOOST_BASE([1.65], [], [AC_MSG_ERROR([Boost libraries are required])]) AX_BOOST_SYSTEM AX_BOOST_REGEX AX_BOOST_THREAD