From nobody Thu Apr 25 19:56:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552585951559767.0888344088446; Thu, 14 Mar 2019 10:52:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6106D3003C53; Thu, 14 Mar 2019 17:52:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAD8860464; Thu, 14 Mar 2019 17:52:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 387FE1819AFE; Thu, 14 Mar 2019 17:52:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2EHqPFm026273 for ; Thu, 14 Mar 2019 13:52:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 238BA60FDC; Thu, 14 Mar 2019 17:52:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-35.ams2.redhat.com [10.36.112.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6087860FDB; Thu, 14 Mar 2019 17:52:19 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 14 Mar 2019 17:52:17 +0000 Message-Id: <20190314175217.6658-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] lcitool: add special case for Debian i386/i686 mixup X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 14 Mar 2019 17:52:30 +0000 (UTC) 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=C3=A9 Reviewed-by: Erik Skultety --- 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_ar= ch)) return archmap[native_arch] =20 + @staticmethod + def native_arch_to_lib(native_arch): + arch =3D Util.native_arch_to_abi(native_arch) + if arch =3D=3D "i686-linux-gnu": + arch =3D "i386-linux-gnu" + return arch + @staticmethod def native_arch_to_deb_arch(native_arch): archmap =3D { @@ -640,12 +647,14 @@ class Application: if args.cross_arch: deb_arch =3D Util.native_arch_to_deb_arch(args.cross_arch) abi =3D Util.native_arch_to_abi(args.cross_arch) + lib =3D Util.native_arch_to_lib(args.cross_arch) gcc =3D "gcc-" + abi varmap["cross_arch"] =3D deb_arch pkg_names =3D [p + ":" + deb_arch for p in cross_pkgs.valu= es()] pkg_names.append(gcc) varmap["cross_pkgs"] =3D " \\\n ".join(sorted(s= et(pkg_names))) varmap["cross_abi"] =3D abi + varmap["cross_lib"] =3D lib =20 sys.stdout.write(textwrap.dedent(""" RUN export DEBIAN_FRONTEND=3Dnoninteractive && \\ @@ -673,7 +682,7 @@ class Application: ENV ABI "{cross_abi}" ENV CONFIGURE_OPTS "--host=3D{cross_abi} \\ --target=3D{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 =3D=3D "rpm": if os_name =3D=3D "Fedora" and os_version =3D=3D "Rawhide": --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list