0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't mess with pkgconfig path in tools other than cross-compile.py

Browse source
This commit is contained in:
loonycyborg 2023-06-11 13:20:40 +03:00
parent 9a8651f83c
commit a501343865
No known key found for this signature in database
GPG key ID: 6E8233FAB8F26D61
3 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scons/cairo.py
View file

@ -7,15 +7,7 @@ def CheckCairo(context, min_version):
context.Message("Checking for Cairo... ")
env = context.env
gtkdir = env.get("gtkdir") or environ.get("GTK_BASEPATH") or env.get("prefix")
if gtkdir:
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))
if sys.platform != "win32":
env["PKG_CONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH", "")
version_arg = env["ESCAPE"](" >= ") + min_version
env.ParseConfig("pkg-config --libs --cflags $PKG_CONFIG_FLAGS cairo" + version_arg)
context.Result("yes")

7
scons/pango.py
View file

@ -7,15 +7,8 @@ from SCons.Util import AppendPath
def CheckPango(context, backend, require_version = None):
context.Message("Checking for Pango with " + backend + " backend... ")
env = context.env
gtkdir = env.get("gtkdir") or os.environ.get("GTK_BASEPATH") or env.get("prefix")
if gtkdir:
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))
if sys.platform != "win32":
env["PKG_CONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH", "")
version_arg = ""
if require_version:
version_arg = env["ESCAPE"](" >= ") + require_version

1
scons/pkgconfig.py
View file

@ -5,7 +5,6 @@ import os, sys
def run_pkg_config(context, name):
env = context.env
try:
env["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH", "")
env.ParseConfig("pkg-config --libs --cflags $PKG_CONFIG_FLAGS --silence-errors $PKGCONFIG_FLAGS \"" + name + "\"")
context.Log("Found '" + name + "' with pkg-config.\n")
return True