From 16eb293b1568dbc219e1bce420cee21555f63a9e Mon Sep 17 00:00:00 2001 From: proller Date: Thu, 16 Nov 2017 20:47:54 +0300 Subject: [PATCH] No more gcc-6 and clang 3.8 --- CMakeLists.txt | 6 +++--- debian/control | 2 +- debian/rules | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a0ed52128f..55ddd5cc409 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") message (FATAL_ERROR "GCC version must be at least 7! For example, if GCC 7 is available under gcc-7, g++-7 names, do the following: export CC=gcc-7 CXX=g++-7; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.") endif () elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # Require at least clang 3.8 - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8) - message (FATAL_ERROR "Clang version must be at least 3.8! Recommended 4+") + # Require at least clang 3.9 + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.9) + message (FATAL_ERROR "Clang version must be at least 3.9! Recommended 4+") endif () if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4) message (WARNING "Compilation has only been tested with Clang 4+") diff --git a/debian/control b/debian/control index 7c22267ea9b..96ebc15f4f3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Alexey Milovidov Build-Depends: debhelper (>= 9), cmake3 | cmake, - gcc-7 | gcc-6, g++-7 | g++-6, + gcc-7, g++-7, libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev, libicu-dev, libltdl-dev, diff --git a/debian/rules b/debian/rules index b8a75557f10..9e25fd1910e 100755 --- a/debian/rules +++ b/debian/rules @@ -23,8 +23,8 @@ CMAKE_FLAGS += -DENABLE_TESTS=0 DEB_CLANG ?= $(shell which clang-6.0 || which clang-5.0 || which clang-4.0 || which clang || which clang-3.9 || which clang-3.8) -#DEB_CC ?= gcc-6 -#DEB_CXX ?= g++-6 +#DEB_CC ?= gcc-7 +#DEB_CXX ?= g++-7 ifdef DEB_CXX DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)