Merge pull request #6138 from jameshilliard/fix-pkg-config

Search pkgconf system libs/cflags
This commit is contained in:
Andrew Murray 2022-05-02 21:09:45 +10:00 committed by GitHub
commit 0a30e431d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -250,28 +250,32 @@ def _cmd_exists(cmd):
def _pkg_config(name): def _pkg_config(name):
try: command = os.environ.get("PKG_CONFIG", "pkg-config")
command = os.environ.get("PKG_CONFIG", "pkg-config") for keep_system in (True, False):
command_libs = [command, "--libs-only-L", name] try:
command_cflags = [command, "--cflags-only-I", name] command_libs = [command, "--libs-only-L", name]
if not DEBUG: command_cflags = [command, "--cflags-only-I", name]
command_libs.append("--silence-errors") if keep_system:
command_cflags.append("--silence-errors") command_libs.append("--keep-system-libs")
libs = ( command_cflags.append("--keep-system-cflags")
subprocess.check_output(command_libs) if not DEBUG:
.decode("utf8") command_libs.append("--silence-errors")
.strip() command_cflags.append("--silence-errors")
.replace("-L", "") libs = (
) subprocess.check_output(command_libs)
cflags = ( .decode("utf8")
subprocess.check_output(command_cflags) .strip()
.decode("utf8") .replace("-L", "")
.strip() )
.replace("-I", "") cflags = (
) subprocess.check_output(command_cflags)
return libs, cflags .decode("utf8")
except Exception: .strip()
pass .replace("-I", "")
)
return libs, cflags
except Exception:
pass
class pil_build_ext(build_ext): class pil_build_ext(build_ext):