diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-06 20:16:07 +0530 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-07-09 09:21:33 +0000 |
| commit | 7ffb52fe784fee2965e5317c039a64a438dce86e (patch) | |
| tree | 597c415846d855d6e2438a2d0ea73686d53945b8 | |
| parent | 0ca18f250fe98ff2b3d319929b4a38f3a575903c (diff) | |
config: Don't set prefix for Windows builds
We've been doing this since the beginning to ensure correct paths
inside various files such as .pc and .la, but we this is not needed
anymore for two reasons:
1. We ship pkg-config with --define-prefix enabled
2. MSI supports installing into any location
So, always use dirs inside the build/ directory.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/537>
| -rw-r--r-- | cerbero/config.py | 4 | ||||
| -rw-r--r-- | config/cross-win-arm64.cbc | 1 | ||||
| -rw-r--r-- | config/cross-win-armv7.cbc | 1 | ||||
| -rw-r--r-- | config/win32.cbc | 1 | ||||
| -rw-r--r-- | config/win64.cbc | 1 |
5 files changed, 0 insertions, 8 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index cb404ee6..59e29e41 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -710,10 +710,6 @@ class Config (object): raise ConfigurationError('vs_install_path was set, but vs_install_version was not') else: target_platform = 'mingw' - # If the cmd config set the prefix, append the variant modifier to - # it so that we don't clobber different toolchain builds - if self.prefix is not None: - self.prefix += '.' + target_platform self.set_property('prefix', os.path.join(self.home_dir, "dist", "%s_%s" % (target_platform, self.target_arch))) self.set_property('sources', os.path.join(self.home_dir, "sources", diff --git a/config/cross-win-arm64.cbc b/config/cross-win-arm64.cbc index c31a9c48..f3cb44f4 100644 --- a/config/cross-win-arm64.cbc +++ b/config/cross-win-arm64.cbc @@ -1,3 +1,2 @@ -prefix='c:/gstreamer/1.0/arm64' from cerbero.config import Architecture target_arch = Architecture.ARM64 diff --git a/config/cross-win-armv7.cbc b/config/cross-win-armv7.cbc index 2d5998e5..b5f0c257 100644 --- a/config/cross-win-armv7.cbc +++ b/config/cross-win-armv7.cbc @@ -1,3 +1,2 @@ -prefix='c:/gstreamer/1.0/armv7' from cerbero.config import Architecture target_arch = Architecture.ARMv7 diff --git a/config/win32.cbc b/config/win32.cbc index 16012585..680729b2 100644 --- a/config/win32.cbc +++ b/config/win32.cbc @@ -1,3 +1,2 @@ -prefix='c:/gstreamer/1.0/x86' from cerbero.config import Architecture target_arch = Architecture.X86 diff --git a/config/win64.cbc b/config/win64.cbc index 1a609234..9cd377a1 100644 --- a/config/win64.cbc +++ b/config/win64.cbc @@ -1,4 +1,3 @@ -prefix='c:/gstreamer/1.0/x86_64' from cerbero.config import Architecture arch = Architecture.X86_64 target_arch = Architecture.X86_64 |