psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-28 20:03:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/fix-meson-build'

Browse Source
This commit is contained in:
Daniele Varrazzo 2023-08-04 17:19:41 +01:00
commit fb77bdca0b
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -4,6 +4,7 @@ Current release
What's new in psycopg 2.9.7 (unreleased) What's new in psycopg 2.9.7 (unreleased)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Fix building when pg_config returns an empty string (:ticket:`#1599`).
- Wheel package compiled against OpenSSL 1.1.1v. - Wheel package compiled against OpenSSL 1.1.1v.

25
setup.py
View File

@ -105,24 +105,23 @@ For further information please check the 'doc/src/install.rst' file (also at
""") """)
sys.exit(1) sys.exit(1)
def query(self, attr_name): def query(self, attr_name, *, empty_ok=False):
"""Spawn the pg_config executable, querying for the given config """Spawn the pg_config executable, querying for the given config
name, and return the printed value, sanitized. """ name, and return the printed value, sanitized. """
try: try:
pg_config_process = subprocess.Popen( pg_config_process = subprocess.run(
[self.pg_config_exe, "--" + attr_name], [self.pg_config_exe, "--" + attr_name],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
except OSError: except OSError:
raise Warning( raise Warning(
f"Unable to find 'pg_config' file in '{self.pg_config_exe}'") f"Unable to find 'pg_config' file in '{self.pg_config_exe}'")
pg_config_process.stdin.close() if pg_config_process.returncode:
result = pg_config_process.stdout.readline().strip() err = pg_config_process.stderr.decode(errors='backslashreplace')
if not result: raise Warning(f"pg_config --{attr_name} failed: {err}")
raise Warning(pg_config_process.stderr.readline()) result = pg_config_process.stdout.decode().strip()
if not isinstance(result, str): if not result and not empty_ok:
result = result.decode('ascii') raise Warning(f"pg_config --{attr_name} is empty")
return result return result
def find_on_path(self, exename, path_directories=None): def find_on_path(self, exename, path_directories=None):
@ -378,12 +377,14 @@ For further information please check the 'doc/src/install.rst' file (also at
self.include_dirs.append(pg_config_helper.query("includedir")) self.include_dirs.append(pg_config_helper.query("includedir"))
self.include_dirs.append(pg_config_helper.query("includedir-server")) self.include_dirs.append(pg_config_helper.query("includedir-server"))
# add includedirs from cppflags, libdirs from ldflags # if present, add includedirs from cppflags, libdirs from ldflags
for token in pg_config_helper.query("ldflags").split(): tokens = pg_config_helper.query("ldflags", empty_ok=True).split()
for token in tokens:
if token.startswith("-L"): if token.startswith("-L"):
self.library_dirs.append(token[2:]) self.library_dirs.append(token[2:])
for token in pg_config_helper.query("cppflags").split(): tokens = pg_config_helper.query("cppflags", empty_ok=True).split()
for token in tokens:
if token.startswith("-I"): if token.startswith("-I"):
self.include_dirs.append(token[2:]) self.include_dirs.append(token[2:])