database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-20 00:42:27 +03:00
Code

Make configure prefer python3 to plain python.

Browse Source 
This avoids possibly selecting Python 2.x on systems that have
both Python 2 and Python 3.  We used to feel that what "python"
links to is a user choice that we should honor.  However, we're
about to cease support for Python 2, so users will no longer have
any choice of that sort.  This small change is being made ahead
of the big Python-2-ectomy so that we can see how much of the
buildfarm is not yet prepared for that.  Systems with only
Python 2 will continue to build that way, for now.

Discussion: https://postgr.es/m/2872c9a0-4b0a-1354-d5f6-94d6f85ba354@enterprisedb.com
This commit is contained in:
Tom Lane 2022-01-19 15:38:58 -05:00
parent a7f4171071
commit f201da39ed
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/python.m4
View File

@ -9,14 +9,12 @@
# Look for Python and set the output variable 'PYTHON' if found, # Look for Python and set the output variable 'PYTHON' if found,
# fail otherwise. # fail otherwise.
# #
# As the Python 3 transition happens and PEP 394 isn't updated, we # Since we are transitioning to supporting only Python 3.x,
# need to cater to systems that don't have unversioned "python" by # prefer python3 to plain python. If the latter exists at all,
# default. Some systems ship with "python3" by default and perhaps # it very possibly points to python2, which we don't want to
# have "python" in an optional package. Some systems only have # select unless it's the only choice.
# "python2" and "python3", in which case it's reasonable to prefer the
# newer version.
AC_DEFUN([PGAC_PATH_PYTHON], AC_DEFUN([PGAC_PATH_PYTHON],
[PGAC_PATH_PROGS(PYTHON, [python python3 python2]) [PGAC_PATH_PROGS(PYTHON, [python3 python python2])
AC_ARG_VAR(PYTHON, [Python program])dnl AC_ARG_VAR(PYTHON, [Python program])dnl
if test x"$PYTHON" = x""; then if test x"$PYTHON" = x""; then
AC_MSG_ERROR([Python not found]) AC_MSG_ERROR([Python not found])

2
configure vendored
View File

@ -10279,7 +10279,7 @@ fi
if test "$with_python" = yes; then if test "$with_python" = yes; then
if test -z "$PYTHON"; then if test -z "$PYTHON"; then
for ac_prog in python python3 python2 for ac_prog in python3 python python2
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2

2
doc/src/sgml/installation.sgml
View File

@ -1875,7 +1875,7 @@ build-postgresql:
language becomes available. See language becomes available. See
<xref linkend="plpython-python23"/> <xref linkend="plpython-python23"/>
for more information. If this is not set, the following are probed for more information. If this is not set, the following are probed
in this order: <literal>python python3 python2</literal>. in this order: <literal>python3 python python2</literal>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>