TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Check pkg-config exit status

Browse source 
Only trust the output of pkg-config if it exited success.  Capture any
text sent to its stderr and reprint it, with decorations, to the screen
and to the log.
This commit is contained in:
Kp 2023-01-26 02:49:21 +00:00
parent 7b1a0fc643
commit 54d04acbe1
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SConstruct
View file

@ -390,7 +390,13 @@ class ConfigureTests(_ConfigureTests):
mv_cmd = pkgconfig + ('--modversion', pkgconfig_name)
try:
Display("%s: reading %s version from %s\n" % (message, pkgconfig_name, mv_cmd))
v = StaticSubprocess.pcall(mv_cmd)
v = StaticSubprocess.pcall(mv_cmd, stderr=subprocess.PIPE)
if v.err:
for l in v.err.splitlines():
Display('%s: pkg-config error: %s: %s\n' % (message, display_name, l.decode()))
if v.returncode:
Display('%s: pkg-config failed: %s: %d; using default flags %r\n' % (message, display_name, v.returncode, guess_flags))
return guess_flags
if v.out:
Display("%s: %s version: %r\n" % (message, display_name, v.out.splitlines()[0]))
except OSError as o:
@ -399,7 +405,14 @@ class ConfigureTests(_ConfigureTests):
else:
Display("%s: reading %s settings from %s\n" % (message, display_name, cmd))
try:
out = StaticSubprocess.pcall(cmd).out
v = StaticSubprocess.pcall(cmd, stderr=subprocess.PIPE)
if v.err:
for l in v.err.splitlines():
Display('%s: pkg-config error: %s: %s\n' % (message, display_name, l.decode()))
if v.returncode:
Display('%s: pkg-config failed: %s: %d; using default flags %r\n' % (message, display_name, v.returncode, guess_flags))
return guess_flags
out = v.out
flags = {
k:v for k,v in context.env.ParseFlags(' ' + out.decode()).items()
if v and (k[0] in 'CL')