diff --git a/.travis.yml b/.travis.yml index 3eed4518..52812582 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ dist: bionic language: c before_install: - - sudo apt-get -y --no-install-recommends install postgresql-10 postgresql-server-dev-10 - - sudo pkill -9 postgres + - sudo apt-get -y --no-install-recommends install postgresql-11 postgresql-server-dev-11 + - sudo pkill -9 postgres || true - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- compiler: diff --git a/CMakeLists.txt b/CMakeLists.txt index 122f7da8..5570050e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,9 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "") set(CMAKE_BUILD_TYPE "Debug") endif() if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O2") + set(CMAKE_C_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wstrict-aliasing -g -O2 -pthread") elseif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(CMAKE_C_FLAGS "-std=gnu99 -fsanitize=address -pedantic -Wall -Wextra -Wstrict-aliasing -g -O0") + set(CMAKE_C_FLAGS "-std=gnu99 -fsanitize=address -pedantic -Wall -Wextra -Wstrict-aliasing -g -O0 -pthread") endif() string(TOLOWER ${CMAKE_BUILD_TYPE} OD_VERSION_BUILD) diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake index c65b3be5..47eea0ff 100644 --- a/cmake/FindPostgreSQL.cmake +++ b/cmake/FindPostgreSQL.cmake @@ -11,7 +11,7 @@ find_path( PATH_SUFFIXES PG_INCLUDE_SERVER ) -option(PG_VERSION_NUM "PostgreSQL version" 100000) +option(PG_VERSION_NUM "PostgreSQL version" 110000) execute_process ( COMMAND pg_config --libdir @@ -35,13 +35,13 @@ set(POSTGRESQL_INCLUDE_DIR ${PG_INCLUDE_SERVER}) find_library( POSTGRESQL_LIBRARY NAMES pgcommon - HINTS ${PG_LIBDIR} ${PG_PKGLIBDIR} + HINTS ${PG_PKGLIBDIR} ${PG_LIBDIR} ) find_library( POSTGRESQL_LIBPGPORT NAMES pgport - HINTS ${PG_LIBDIR} ${PG_PKGLIBDIR} + HINTS ${PG_PKGLIBDIR} ${PG_LIBDIR} ) find_library( diff --git a/docker/Dockerfile b/docker/Dockerfile index 68cc76c8..cb87b2ae 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gdb \ libpam0g-dev \ libssl-dev \ - postgresql-server-dev-10 \ + postgresql-server-dev-11 \ valgrind COPY entrypoint.sh /usr/local/bin/entrypoint.sh diff --git a/scripts/debian/control b/scripts/debian/control index d9dccdd9..aca5a992 100644 --- a/scripts/debian/control +++ b/scripts/debian/control @@ -3,7 +3,7 @@ Section: database Priority: extra Maintainer: mdb Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9), make, cmake, libssl-dev (>= 1.0.1), libpam-dev, postgresql-server-dev-10 +Build-Depends: debhelper (>= 9), make, cmake, libssl-dev (>= 1.0.1), libpam-dev, postgresql-server-dev-11 Homepage: https://github.com/yandex/odyssey Package: @NAME@