From e286d3f23d9c5d28e2e29c52dff79a7c8c7691f8 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 20 Oct 2020 11:39:00 +0200 Subject: [PATCH] add support for finding pg_config in Postgresql repos It uses the same PostgreSQL_ADDITIONAL_VERSIONS variable as osm2pgsql so that setting that should be sufficient to make it work. --- module/CMakeLists.txt | 11 ++++++++++- vagrant/Install-on-Centos-7.sh | 6 +----- vagrant/Install-on-Centos-8.sh | 6 +----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt index 03beacb2..6aef6a5a 100644 --- a/module/CMakeLists.txt +++ b/module/CMakeLists.txt @@ -1,5 +1,14 @@ # just use the pgxs makefile -find_program(PG_CONFIG pg_config) + +foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3") + list(APPEND PG_CONFIG_HINTS + "/usr/pgsql-${suffix}/bin") +endforeach() + +find_program(PG_CONFIG pg_config HINTS ${PG_CONFIG_HINTS}) + + + execute_process(COMMAND ${PG_CONFIG} --pgxs OUTPUT_VARIABLE PGXS OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh index 7ce09727..f26c567c 100755 --- a/vagrant/Install-on-Centos-7.sh +++ b/vagrant/Install-on-Centos-7.sh @@ -42,11 +42,7 @@ python3-pip python3-setuptools python3-devel \ expat-devel zlib-devel - # make sure pg_config gets found - echo 'PATH=/usr/pgsql-11/bin/:$PATH' >> ~/.bash_profile - source ~/.bash_profile - - pip3 install --user psycopg2 pytidylib + pip3 install --user psycopg2 # diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh index 75b7a558..8fd983d3 100755 --- a/vagrant/Install-on-Centos-8.sh +++ b/vagrant/Install-on-Centos-8.sh @@ -35,11 +35,7 @@ python3-pip python3-setuptools python3-devel \ expat-devel zlib-devel - # make sure pg_config gets found - echo 'PATH=/usr/pgsql-12/bin:$PATH' >> ~/.bash_profile - source ~/.bash_profile - - pip3 install --user psycopg2 pytidylib + pip3 install --user psycopg2 # -- 2.45.1