diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-21 10:42:26 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-25 05:25:42 +0530 |
| commit | 151e8c47edf2df402bd46eb66f50ff690d54905c (patch) | |
| tree | 713c7ad45295fe7a112e3faaa9678ed6ac98ebf2 | |
| parent | 071e397458c3fcbd9a43736f99e7b7c3a748bded (diff) | |
zbar.recipe: Don't pass CPPFLAGS at all
Now that we explicitly set CPPFLAGS, this was failing to build
because it incorrectly passes CPPFLAGS instead of RCFLAGS to WINDRES.
| -rw-r--r-- | recipes/zbar.recipe | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/zbar.recipe b/recipes/zbar.recipe index f25e33cc..4bc95536 100644 --- a/recipes/zbar.recipe +++ b/recipes/zbar.recipe @@ -16,6 +16,8 @@ class Recipe(recipe.Recipe): if self.config.target_platform == Platform.WINDOWS: # This flag should be removed in 0.24 self.append_env('CFLAGS', '-std=c99') + # zbar incorrectly passes CPPFLAGS to WINDRES, which then barfs on + # args it can't understand + self.set_env('CPPFLAGS', '') if self.config.target_platform in [Platform.IOS, Platform.DARWIN]: self.autoreconf = True - |