Skip to content

Commit 89441c9

Browse files
feodorfeodor
committed
Merge branch 'master' into anyelement
2 parents f01011c + d8179b0 commit 89441c9

File tree

27 files changed

+319
-4532
lines changed

27 files changed

+319
-4532
lines changed

‎config/python.m4‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,4 @@ AC_SUBST(python_libdir)[]dnl
9797
AC_SUBST(python_libspec)[]dnl
9898
AC_SUBST(python_additional_libs)[]dnl
9999
100-
# threaded python is not supported on OpenBSD
101-
AC_MSG_CHECKING(whether Python is compiled with thread support)
102-
pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
103-
if test "$pythreads" = "1"; then
104-
AC_MSG_RESULT(yes)
105-
case $host_os in
106-
openbsd*)
107-
AC_MSG_ERROR([threaded Python not supported on this platform])
108-
;;
109-
esac
110-
else
111-
AC_MSG_RESULT(no)
112-
fi
113-
114100
])# PGAC_CHECK_PYTHON_EMBED_SETUP

‎configure‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7526,23 +7526,6 @@ python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join
75267526
$as_echo "${python_libspec} ${python_additional_libs}" >&6; }
75277527

75287528

7529-
# threaded python is not supported on OpenBSD
7530-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python is compiled with thread support" >&5
7531-
$as_echo_n "checking whether Python is compiled with thread support... " >&6; }
7532-
pythreads=`${PYTHON} -c "import sys; print(int('thread' in sys.builtin_module_names))"`
7533-
if test "$pythreads" = "1"; then
7534-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7535-
$as_echo "yes" >&6; }
7536-
case $host_os in
7537-
openbsd*)
7538-
as_fn_error $? "threaded Python not supported on this platform" "$LINENO" 5
7539-
;;
7540-
esac
7541-
else
7542-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7543-
$as_echo "no" >&6; }
7544-
fi
7545-
75467529

75477530

75487531
# We need libpython as a shared library. With Python >=2.5, we

‎contrib/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ SUBDIRS = \
2828
oid2name \
2929
pageinspect \
3030
passwordcheck \
31-
pg_audit \
3231
pg_buffercache \
3332
pg_freespacemap \
3433
pg_prewarm \

‎contrib/pg_audit/.gitignore‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎contrib/pg_audit/Makefile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)