diff options
| author | Stéphane Cerveau <scerveau@collabora.com> | 2020-05-18 19:06:32 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-06-07 19:04:14 +0100 |
| commit | 3c79f8f8c21bc908e669e2defe7cbf2c285ac41e (patch) | |
| tree | f83ba8f7e0d5462e1a8c14fc7f98d577d0a697c6 | |
| parent | accf5d2da1beb18122330f4fafe5661fc24c80c6 (diff) | |
source: use config_src_dir instead of build_dir to apply patches
As for licensing using the config_src_dir to apply the patches
as build_dir can be different in CMake case.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/707>
| -rw-r--r-- | cerbero/build/source.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cerbero/build/source.py b/cerbero/build/source.py index f401c960..ab66bfd2 100644 --- a/cerbero/build/source.py +++ b/cerbero/build/source.py @@ -285,15 +285,14 @@ class Tarball(BaseTarball, Source): # Since we just extracted this, a Windows anti-virus might still # have a lock on files inside it. shell.windows_proof_rename(extracted, self.build_dir) - - git.init_directory(self.build_dir, logfile=get_logfile(self)) + git.init_directory(self.config_src_dir, logfile=get_logfile(self)) for patch in self.patches: if not os.path.isabs(patch): patch = self.relative_path(patch) if self.strip == 1: - git.apply_patch(patch, self.build_dir, logfile=get_logfile(self)) + git.apply_patch(patch, self.config_src_dir, logfile=get_logfile(self)) else: - shell.apply_patch(patch, self.build_dir, self.strip, logfile=get_logfile(self)) + shell.apply_patch(patch, self.config_src_dir, self.strip, logfile=get_logfile(self)) class GitCache (Source): |