Skip to content

build: unbreak --with-intl=system-icu build #28118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bnoordhuis wants to merge 3 commits into from
Closed

build: unbreak --with-intl=system-icu build #28118

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa5e4cc
build: don't swallow pkg-config warnings
bnoordhuis Jun 7, 2019
1a62bc8
build: fix icu-i18n pkg-config version check
bnoordhuis Jun 7, 2019
167f4b0
build: unbreak --with-intl=system-icu build
bnoordhuis Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
build: don't swallow pkg-config warnings
  • Loading branch information
@bnoordhuis
bnoordhuis committed Jun 7, 2019
commit aa5e4cc49c15b6af8ac68907459bc5e6812b5253
8 changes: 5 additions & 3 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,18 +628,20 @@ def pkg_config(pkg):
Returns ("-l flags", "-I flags", "-L flags", "version")
otherwise (None, None, None, None)"""
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
args = [] # Print pkg-config warnings on first round.
retval = ()
for flag in ['--libs-only-l', '--cflags-only-I',
'--libs-only-L', '--modversion']:
args += [flag, pkg]
try:
proc = subprocess.Popen(
shlex.split(pkg_config) + ['--silence-errors', flag, pkg],
stdout=subprocess.PIPE)
proc = subprocess.Popen(shlex.split(pkg_config) + args,
stdout=subprocess.PIPE)
val = proc.communicate()[0].strip()
except OSError as e:
if e.errno != errno.ENOENT: raise e # Unexpected error.
return (None, None, None, None) # No pkg-config/pkgconf installed.
retval += (val,)
args = ['--silence-errors']
return retval


Expand Down