From d52b33fd4f7eb5715b386622961c8305a7bc15a2 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 12 May 2020 01:16:09 +0530 Subject: 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: --- recipes/build-tools/pkg-config.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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') -- cgit v1.2.3