build: avoid passing empty strings to build flags #1789
Conversation
While checking the return values from icu-i18n, we didn't validate the content before passing it to the build system. Also make cflags parsing more robust by avoiding empty strings. Fixes: nodejs#1787
| @@ -690,7 +690,8 @@ def configure_library(lib, output): | |||
| if default_libpath: | |||
| default_libpath = '-L' + default_libpath | |||
| (pkg_libs, pkg_cflags, pkg_libpath) = pkg_config(lib) | |||
| cflags = pkg_cflags.split('-I') if pkg_cflags else default_cflags | |||
| # Remove empty strings from the list of include_dirs | |||
| cflags = filter(None, pkg_cflags.split('-I')) if pkg_cflags else default_cflags | |||
There was a problem hiding this comment.
Aside, the filter step removes empty lines but not blank lines. Would that matter?
There was a problem hiding this comment.
I haven't come across that just yet. I'll improve the filter; guess it couldn't hurt. Just want to avoid making parsing too complex.
There was a problem hiding this comment.
@bnoordhuis filter(False, foo) would do, right (captures '' or None)?
There was a problem hiding this comment.
I don't think filter() accepts False. What about this?
cflags = default_cflags
if pkg_cflags:
cflags = filter(False, map(str.strip, pkg_cflags.split('-I')))
# Maybe easier to read:
cflags = map(str.strip, pkg_cflags.split('-I'))
cflags = [s for s in cflags if s]There was a problem hiding this comment.
Adapted a similar strategy.
|
lgtm |
|
@bnoordhuis looks good to you? |
|
LGTM |
| @@ -690,7 +690,11 @@ def configure_library(lib, output): | |||
| if default_libpath: | |||
| default_libpath = '-L' + default_libpath | |||
| (pkg_libs, pkg_cflags, pkg_libpath) = pkg_config(lib) | |||
| cflags = pkg_cflags.split('-I') if pkg_cflags else default_cflags | |||
| # Remove empty strings from the list of include_dirs | |||
| if pkg_cflags: | |||
There was a problem hiding this comment.
Minor nitpick. What if pkg_cflags is a blank string with more than one whitespace characters? cflags would become an empty list. Is that okay?
There was a problem hiding this comment.
@thefourtheye I've never been able to get pkg-config give me a similar output. Even if it did, calling strip on " " (two spaces) would return empty:
>>> " ".strip()
''
|
Committed in c5a1009. I'll drive including this in all minor releases that needs a fix. Thanks for the input and reviews everyone. |
While checking the return values from icu-i18n, we didn't validate the content before passing it to the build system. Also make cflags parsing more robust by avoiding empty strings. Fixes: nodejs/node#1787 PR-URL: nodejs/node#1789 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
While checking the return values from icu-i18n, we didn't validate the content (enough) before passing it to the build system. Also make cflags parsing more robust by avoiding empty strings.
The reason we're introducing filtering is to avoid empty strings which might occur for other reasons (I found deviations between the systems I've been testing on and the stuff from arch linux). When you pass input to
.split()it stops doing the "convenience stuff";Fixes: #1787
/R=@bnoordhuis, @alferpal