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

scons: Fix blowing up with OS_ENV=true

Browse source 
If PKG_CONFIG_PATH was unset it was effectively trying to set this
os.environ variable to None which os.environ doesn't allow.
This commit is contained in:
loonycyborg 2015-04-07 15:30:51 +03:00
parent 03ab839f30
commit a52cc353df
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scons/pango.py
View file

@ -15,7 +15,7 @@ def CheckPango(context, backend, require_version = None):
env["PKGCONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH")
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH", "")
version_arg = ""
if require_version:
version_arg = env["ESCAPE"](" >= ") + require_version

2
scons/pkgconfig.py
View file

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