Commit e2ad364
build: don't swallow pkg-config warnings
PR-URL: #28118
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 6aa6451 commit e2ad364
1 file changed
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -628,18 +628,20 @@ def pkg_config(pkg): | |||
| 628 | 628 | Returns ("-l flags", "-I flags", "-L flags", "version") | |
| 629 | 629 | otherwise (None, None, None, None)""" | |
| 630 | 630 | pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') | |
| 631 | + args = [] # Print pkg-config warnings on first round. | ||
| 631 | 632 | retval = () | |
| 632 | 633 | for flag in ['--libs-only-l', '--cflags-only-I', | |
| 633 | 634 | '--libs-only-L', '--modversion']: | |
| 635 | + args += [flag, pkg] | ||
| 634 | 636 | try: | |
| 635 | - proc = subprocess.Popen( | ||
| 636 | - shlex.split(pkg_config) + ['--silence-errors', flag, pkg], | ||
| 637 | - stdout=subprocess.PIPE) | ||
| 637 | + proc = subprocess.Popen(shlex.split(pkg_config) + args, | ||
| 638 | + stdout=subprocess.PIPE) | ||
| 638 | 639 | val = proc.communicate()[0].strip() | |
| 639 | 640 | except OSError as e: | |
| 640 | 641 | if e.errno != errno.ENOENT: raise e # Unexpected error. | |
| 641 | 642 | return (None, None, None, None) # No pkg-config/pkgconf installed. | |
| 642 | 643 | retval += (val,) | |
| 644 | + args = ['--silence-errors'] | ||
| 643 | 645 | return retval | |
| 644 | 646 | ||
| 645 | 647 | ||
0 commit comments