diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-10 02:04:39 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-12-11 00:42:32 +0000 |
| commit | dedb8e580f865e2541b8cb19dace8830030c43d3 (patch) | |
| tree | 1c31d0432faf9539ce64379fbb57f57de41abbc3 /recipes/pkg-config.recipe | |
| parent | 205d6dc33e9fd091cd8f57dbf9250aab29afea83 (diff) | |
cerbero: Make all pkgconfig files reliably relocatable
We already tried to do relocatable pkgconfig files by using
--define-prefix in pkg-config, but that was error-prone since it
relied on the user using the correct pkg-config. It was also broken
for any pkgconfig files that weren't in [PREFIX]/dir/pkgconfig, such
as gstreamer plugin pc files.
Using ${pcfiledir} fixes it.
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1643
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1049>
Diffstat (limited to 'recipes/pkg-config.recipe')
| -rw-r--r-- | recipes/pkg-config.recipe | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/recipes/pkg-config.recipe b/recipes/pkg-config.recipe index dffc3f34..2dbb96f0 100644 --- a/recipes/pkg-config.recipe +++ b/recipes/pkg-config.recipe @@ -15,10 +15,6 @@ class Recipe(recipe.Recipe): files_share = ['share/aclocal/pkg.m4'] def prepare(self): - # --define-prefix is too unreliable on Debian-like distros that have - # pkgconfig in /usr/lib/x86_64-linux-gnu etc. instead of in /usr/lib - if self.config.platform != Platform.LINUX: - self.configure_options += '--enable-define-prefix ' # Strictly speaking, it poesn't need to be a runtime dep, but it will # not make it into the Cerbero CI deps cache otherwise. if self.config.platform in (Platform.WINDOWS, Platform.DARWIN) and not self.config.variants.uwp: |