diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-05-12 01:16:09 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-10-09 00:29:37 +0530 |
| commit | d52b33fd4f7eb5715b386622961c8305a7bc15a2 (patch) | |
| tree | b7be7cb02add56f9c7c0216faf9975fd938dbfdc | |
| parent | 824a1f71498be2b8a0515bef1b9252d1b511150d (diff) | |
pkg-config.recipe: Do not enable --define-prefix on Linux
It doesn't work well if your prefix is not `usr/libblah/pkgconfig`,
such as on Debian.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/634>
| -rw-r--r-- | recipes/build-tools/pkg-config.recipe | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/build-tools/pkg-config.recipe b/recipes/build-tools/pkg-config.recipe index e9ca75d3..311c39d4 100644 --- a/recipes/build-tools/pkg-config.recipe +++ b/recipes/build-tools/pkg-config.recipe @@ -8,10 +8,14 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL url = 'https://pkgconfig.freedesktop.org/releases/pkg-config-%(version)s.tar.gz' tarball_checksum = '6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591' - configure_options = '--with-internal-glib --disable-host-tool --enable-define-prefix ' + configure_options = '--with-internal-glib --disable-host-tool ' files_bins = ['pkg-config'] 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 ' self.append_env('CFLAGS', '-Wno-error=format-nonliteral') |