From 4a9416699bd6eaf1c32ed71b7b4e8d9730604e7d Mon Sep 17 00:00:00 2001
From: Denis Chaplygin <denis.chaplygin@wolt.com>
Date: Wed, 2 Sep 2020 13:34:26 +0300
Subject: [PATCH] Added GCC10 support to CI builds.

---
 .travis.yml    | 18 +++++++++++++++---
 CMakeLists.txt | 16 ++++++++--------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a62697ae..3583367a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,6 +121,15 @@ matrix:
           packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='5.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
 
+    - os: linux
+      dist: focal
+      compiler: "gcc-10-release"
+      addons: &gcc10
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-10', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev', 'ccache', 'cmake']
+      env: CCOMPILER='gcc-10' CXXCOMPILER='g++-10' BUILD_TYPE='Release' CXXFLAGS='-Wno-cast-function-type'
+
     - os: linux
       compiler: "gcc-9-release"
       addons: &gcc9
@@ -444,9 +453,12 @@ before_install:
   - CMAKE_DIR="mason_packages/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}"
   - mkdir -p ${CMAKE_DIR}
   - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR} || travis_terminate 1
-  - export PATH=${CMAKE_DIR}/bin:${PATH}
-  - ${MASON} install tbb 2017_U7 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_U7)/lib/:${LD_LIBRARY_PATH}
-  - ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
+  - |
+    if [[ "${TRAVIS_DIST}" != "focal" ]]; then
+      export PATH=${CMAKE_DIR}/bin:${PATH}
+      ${MASON} install tbb 2017_U7 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_U7)/lib/:${LD_LIBRARY_PATH}
+      ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
+    fi
   - |
     if [[ ! -z ${CLANG_VERSION} ]]; then
       export CCOMPILER='clang'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6feb6de9..73560892e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,16 +596,16 @@ add_definitions(${OSRM_DEFINES})
 include_directories(SYSTEM ${DEPENDENCIES_INCLUDE_DIRS})
 
 set(BOOST_BASE_LIBRARIES
-   ${Boost_DATE_TIME_LIBRARY}
-   ${Boost_CHRONO_LIBRARY}
-   ${Boost_FILESYSTEM_LIBRARY}
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_THREAD_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY})
+   ${Boost_DATE_TIME_LIBRARY_RELEASE}
+   ${Boost_CHRONO_LIBRARY_RELEASE}
+   ${Boost_FILESYSTEM_LIBRARY_RELEASE}
+   ${Boost_IOSTREAMS_LIBRARY_RELEASE}
+   ${Boost_THREAD_LIBRARY_RELEASE}
+   ${Boost_SYSTEM_LIBRARY_RELEASE})
 
 set(BOOST_ENGINE_LIBRARIES
-  ${Boost_ZLIB_LIBRARY}
-  ${Boost_REGEX_LIBRARY}
+  ${Boost_ZLIB_LIBRARY_RELEASE}
+  ${Boost_REGEX_LIBRARY_RELEASE}
   ${BOOST_BASE_LIBRARIES})
 
 # Binaries