hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for finding pg_config in Postgresql repos

Browse Source 
It uses the same PostgreSQL_ADDITIONAL_VERSIONS variable as
osm2pgsql so that setting that should be sufficient to make
it work.
This commit is contained in:
Sarah Hoffmann
2020-10-20 11:39:00 +02:00
parent 6c8a7b0a1a
commit e286d3f23d
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/CMakeLists.txt
View File

@@ -1,5 +1,14 @@
# just use the pgxs makefile # 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 execute_process(COMMAND ${PG_CONFIG} --pgxs
OUTPUT_VARIABLE PGXS OUTPUT_VARIABLE PGXS
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)

6
vagrant/Install-on-Centos-7.sh
View File

@@ -42,11 +42,7 @@
python3-pip python3-setuptools python3-devel \ python3-pip python3-setuptools python3-devel \
expat-devel zlib-devel expat-devel zlib-devel
# make sure pg_config gets found pip3 install --user psycopg2
echo 'PATH=/usr/pgsql-11/bin/:$PATH' >> ~/.bash_profile
source ~/.bash_profile
pip3 install --user psycopg2 pytidylib
# #

6
vagrant/Install-on-Centos-8.sh
View File

@@ -35,11 +35,7 @@
python3-pip python3-setuptools python3-devel \ python3-pip python3-setuptools python3-devel \
expat-devel zlib-devel expat-devel zlib-devel
# make sure pg_config gets found pip3 install --user psycopg2
echo 'PATH=/usr/pgsql-12/bin:$PATH' >> ~/.bash_profile
source ~/.bash_profile
pip3 install --user psycopg2 pytidylib
# #