Enable Python Limited API for PL/Python on MSVC

Previously, the Python Limited API was disabled on MSVC due to build
failures caused by Meson not knowing to link against python3.lib
instead of python3XX.lib when using the Limited API.

This commit works around the Meson limitation by explicitly finding
and linking against python3.lib on MSVC, and removes the preprocessor
guard that was disabling the Limited API on MSVC in plpython.h.

This requires python3.lib to be present in the Python installation,
which is included when Python is installed.

Author: Bryan Green <dbryan.green@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/ee410de1-1e0b-4770-b125-eeefd4726a24%40eisentraut.org
master
Peter Eisentraut 2 days ago
parent 4196d6178a
commit 2bc60f8621
  1. 16
      meson.build
  2. 4
      src/pl/plpython/plpython.h

@ -1336,7 +1336,21 @@ if not pyopt.disabled()
pm = import('python')
python3_inst = pm.find_installation(python.full_path(), required: pyopt)
if python3_inst.found()
python3_dep = python3_inst.dependency(embed: true, required: pyopt)
# On MSVC, link against python3.lib instead of python3XX.lib for
# Python Limited API. Right now, this is the only platform that
# needs this workaround. In the long run, Meson should handle
# this internally:
# <https://github.com/mesonbuild/meson/issues/13824>.
if host_system == 'windows' and cc.get_id() == 'msvc'
python3_libdir = python3_inst.get_variable('prefix') / 'libs'
python3_lib = cc.find_library('python3', dirs: python3_libdir, required: pyopt)
python3_dep = declare_dependency(
include_directories: include_directories(python3_inst.get_variable('prefix') / 'include'),
dependencies: python3_lib,
)
else
python3_dep = python3_inst.dependency(embed: true, required: pyopt)
endif
# Remove this check after we depend on Meson >= 1.1.0
if not cc.check_header('Python.h', dependencies: python3_dep, required: pyopt, include_directories: postgres_inc)
python3_dep = not_found_dep

@ -25,12 +25,8 @@
/*
* Enable Python Limited API
*
* XXX currently not enabled on MSVC because of build failures
*/
#if !defined(_MSC_VER)
#define Py_LIMITED_API 0x03020000
#endif
/*
* Pull in Python headers via a wrapper header, to control the scope of

Loading…
Cancel
Save