diff options
| author | Javier Celaya <javier.celaya@flexvdi.com> | 2019-06-10 12:15:01 +0200 |
|---|---|---|
| committer | jcelaya <jcelaya@gmail.com> | 2019-06-28 09:20:50 +0000 |
| commit | 12a42e16ab207421024381f7132701726c618ae8 (patch) | |
| tree | b30b2676e323698599b926dc73a0d79223a0f259 | |
| parent | 10281e8ba5ff5042577fb726336b4baf900ffb30 (diff) | |
Make _add_system_libs reentrant
The method _add_system_libs of ModifyEnvBase is not reentrant, and fails
when called a second time. This happens, at least, in a CMake-based
recipe with use_system_libs = True. This patch fixes it assuming that,
when _old_env is not empty, system lib paths have already been added.
| -rw-r--r-- | cerbero/build/build.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cerbero/build/build.py b/cerbero/build/build.py index c4d00398..c7637ba2 100644 --- a/cerbero/build/build.py +++ b/cerbero/build/build.py @@ -321,6 +321,9 @@ class ModifyEnvBase: Add /usr/lib/pkgconfig to PKG_CONFIG_PATH so the system's .pc file can be found. ''' + # Don't modify env again if already did it once for this function call + if self._old_env: + return new_env = {} add_system_libs(self.config, new_env) for var, val in new_env.items(): |