diff --git a/kiwixbuild/platforms/android.py b/kiwixbuild/platforms/android.py index 1a8e3a4..668a2ab 100644 --- a/kiwixbuild/platforms/android.py +++ b/kiwixbuild/platforms/android.py @@ -26,8 +26,10 @@ class AndroidPlatformInfo(PlatformInfo): def binaries(self): install_path = self.install_path - return {k:pj(install_path, 'bin', v) - for k,v in self.binaries_name.items()} + binaries = {k:pj(install_path, 'bin', v) + for k,v in self.binaries_name.items()} + binaries['PKGCONFIG'] = 'pkg-config' + return binaries @property def ndk_builder(self): diff --git a/kiwixbuild/platforms/armhf.py b/kiwixbuild/platforms/armhf.py index d07710d..6e0497d 100644 --- a/kiwixbuild/platforms/armhf.py +++ b/kiwixbuild/platforms/armhf.py @@ -49,8 +49,10 @@ class ArmhfPlatformInfo(PlatformInfo): ('RANLIB', 'ranlib'), ('LD', 'ld')) ) - return {k:pj(self.root_path, 'bin', v) - for k,v in binaries} + binaries = {k:pj(self.root_path, 'bin', v) + for k,v in binaries} + binaries['PKGCONFIG'] = 'pkg-config' + return binaries @property def exe_wrapper_def(self): diff --git a/kiwixbuild/platforms/i586.py b/kiwixbuild/platforms/i586.py index ec1160a..e090001 100644 --- a/kiwixbuild/platforms/i586.py +++ b/kiwixbuild/platforms/i586.py @@ -37,7 +37,8 @@ class I586PlatformInfo(PlatformInfo): ('AR', 'ar'), ('STRIP', 'strip'), ('RANLIB', 'ranlib'), - ('LD', 'ld')) + ('LD', 'ld'), + ('PKGCONFIG', 'pkg-config')) } def set_env(self, env): diff --git a/kiwixbuild/platforms/ios.py b/kiwixbuild/platforms/ios.py index 523d426..df08374 100644 --- a/kiwixbuild/platforms/ios.py +++ b/kiwixbuild/platforms/ios.py @@ -64,6 +64,7 @@ class iOSPlatformInfo(PlatformInfo): 'STRIP': '/usr/bin/strip', 'RANLIB': '/usr/bin/ranlib', 'LD': '/usr/bin/ld', + 'PKGCONFIG': 'pkg-config', } @property diff --git a/kiwixbuild/platforms/win32.py b/kiwixbuild/platforms/win32.py index b2f3fa6..17b37c4 100644 --- a/kiwixbuild/platforms/win32.py +++ b/kiwixbuild/platforms/win32.py @@ -49,7 +49,8 @@ class Win32PlatformInfo(PlatformInfo): ('AR', 'ar'), ('STRIP', 'strip'), ('WINDRES', 'windres'), - ('RANLIB', 'ranlib')) + ('RANLIB', 'ranlib'), + ('PKGCONFIG', 'pkg-config')) } @property diff --git a/kiwixbuild/templates/meson_cross_file.txt b/kiwixbuild/templates/meson_cross_file.txt index 6a664de..d5e6716 100644 --- a/kiwixbuild/templates/meson_cross_file.txt +++ b/kiwixbuild/templates/meson_cross_file.txt @@ -1,5 +1,5 @@ [binaries] -pkgconfig = 'pkg-config' +pkgconfig = '{binaries[PKGCONFIG]}' c = '{binaries[CC]}' ar = '{binaries[AR]}' cpp = '{binaries[CXX]}'