Set the pkg-config for cross-compiling.

This is needed for win32 on fedora.
It is better to use a specific pkg-config than setting a PKG_CONFIG_LIBDIR.
This avoid other CI (libzim/...) to set a env var specific to win32 build.

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)
+        binaries = {k:pj(install_path, 'bin', v)
-                for k,v in self.binaries_name.items()}
+                    for k,v in self.binaries_name.items()}
+        binaries['PKGCONFIG'] = 'pkg-config'
+        return binaries
 
     @property
     def ndk_builder(self):

kiwixbuild/platforms/armhf.py

@@ -49,8 +49,10 @@ class ArmhfPlatformInfo(PlatformInfo):
                              ('RANLIB', 'ranlib'),
                              ('LD', 'ld'))
                )
-        return {k:pj(self.root_path, 'bin', v)
+        binaries = {k:pj(self.root_path, 'bin', v)
-                for k,v in binaries}
+                    for k,v in binaries}
+        binaries['PKGCONFIG'] = 'pkg-config'
+        return binaries
 
     @property
     def exe_wrapper_def(self):

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):

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

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

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]}'