[libvirt] [jenkins-ci PATCH] lcitool: add special case for Debian i386/i686 mixup

[Daniel P. Berrangé]

Although the toolchain binaries for 32-bit x86 are using the ABI
i686-linux-gnu, the library install directory is strangely named
with the different i386-linux-gnu.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 guests/lcitool | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/guests/lcitool b/guests/lcitool
index 76b2dc7..0f60704 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -101,6 +101,13 @@ class Util:
             raise Exception("Unsupported architecture {}".format(native_arch))
         return archmap[native_arch]
 
+    @staticmethod
+    def native_arch_to_lib(native_arch):
+        arch = Util.native_arch_to_abi(native_arch)
+        if arch == "i686-linux-gnu":
+            arch = "i386-linux-gnu"
+        return arch
+
     @staticmethod
     def native_arch_to_deb_arch(native_arch):
         archmap = {
@@ -640,12 +647,14 @@ class Application:
             if args.cross_arch:
                 deb_arch = Util.native_arch_to_deb_arch(args.cross_arch)
                 abi = Util.native_arch_to_abi(args.cross_arch)
+                lib = Util.native_arch_to_lib(args.cross_arch)
                 gcc = "gcc-" + abi
                 varmap["cross_arch"] = deb_arch
                 pkg_names = [p + ":" + deb_arch for p in cross_pkgs.values()]
                 pkg_names.append(gcc)
                 varmap["cross_pkgs"] = " \\\n            ".join(sorted(set(pkg_names)))
                 varmap["cross_abi"] = abi
+                varmap["cross_lib"] = lib
 
             sys.stdout.write(textwrap.dedent("""
                 RUN export DEBIAN_FRONTEND=noninteractive && \\
@@ -673,7 +682,7 @@ class Application:
                     ENV ABI "{cross_abi}"
                     ENV CONFIGURE_OPTS "--host={cross_abi} \\
                                         --target={cross_abi}"
-                    ENV PKG_CONFIG_LIBDIR "/usr/lib/{cross_abi}/pkgconfig"
+                    ENV PKG_CONFIG_LIBDIR "/usr/lib/{cross_lib}/pkgconfig"
                 """).format(**varmap))
         elif package_format == "rpm":
             if os_name == "Fedora" and os_version == "Rawhide":
-- 
2.20.1