From patchwork Wed Oct 6 15:19:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515331 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp536020ime; Wed, 6 Oct 2021 08:27:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx98s4zQ8ugDVOKsN60w3U8BqxXPqnYuiiHA+gMrSyb+ZDdh/x9vwA5ckXbtczCxYrw38/t X-Received: by 2002:ac8:490c:: with SMTP id e12mr27952415qtq.200.1633534078108; Wed, 06 Oct 2021 08:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633534078; cv=none; d=google.com; s=arc-20160816; b=xJwzRkZZPYKp6bQURlJ2W/SihCBZaEE+ycW/RQSQyQB/xy1VZJVYRIPJ0HmZJMAxwh LEZ6nas9S2N5fF7RJTQ7O3ESg24AinDNehCguRIsAKUJpY8vMdZ/FVghLdexNpZ/bx2n O/bRawP90jIkgBcxQNKazQTqibmNvkmQTZoz/5yPXD8+i+/5xMONn+En38gyzQQFlsAQ znn5DPpYa08CelH4PtdIXhQB6EYwQ925qkrIbHe9gV7MFj/jUhuzVtPTIyvRHMHsH/oz JfSNO6BOyk/kaZ6SnAWp0BejMqG8+dtrIaOFbD9mt3c+UXyCImRT1vmX9P56zheJJVWh Pe/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YLTXsjKR5/Fp+NMNhjCMgTJMRXBC11wjMG3hfEw3URE=; b=im8y/uUdToZQ7CYmpMwvXhOdKmv1ecAjqQNfmXyrFcWUGIKVPckdgF7fE46pFh6Vav IYHwJ1lJsevgyj9dgOvLqyBUCoCfgvsSyXopoFEiJTl2/+tXO0oJCtmeuU1MMqt0oU0t 7pHonWuDIxSSWbZTRhdZmXGJNdlu2I1TYMYjv6jHGLFNgLnDhRDljE4fDi626zfLn02b +8olYhjWdhr5i4WjgL/rZRel0m8d4iM6tjO/78AkFoR8cSw7WsnEkTKRlUSOU/W3Lal4 FQRs8Gs4ZPC3gLIMx3GVjAuOtu6Qjo1yDUN98Ff2LJlkIxREWvdbnF8okZDykYM4BFNV p2DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L2sc489i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h17si547930qkl.287.2021.10.06.08.27.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Oct 2021 08:27:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L2sc489i; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY8pp-0005rE-Hr for patch@linaro.org; Wed, 06 Oct 2021 11:27:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY8iT-0002EX-ML for qemu-devel@nongnu.org; Wed, 06 Oct 2021 11:20:21 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:34535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mY8iQ-0007bV-A8 for qemu-devel@nongnu.org; Wed, 06 Oct 2021 11:20:21 -0400 Received: by mail-pl1-x62c.google.com with SMTP id b22so1920319pls.1 for ; Wed, 06 Oct 2021 08:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YLTXsjKR5/Fp+NMNhjCMgTJMRXBC11wjMG3hfEw3URE=; b=L2sc489iZBykEKxxMnXTEEVuFUzkNAreFzQJ0g+nrFJup3n2CaLM06oQoqoRb3QO0+ O9sQNq+mwwlMyLhXythvogw2Ig8UWis39jwbXEbC3kqXdhFXWEMcfk65pvu/RHdYwa4V EQmwW+8abiqMnM4DzUmMM4hVH6rcDMY3O1By45SwP/GkMlpTX/HmXFt4pNdbUv9o/Nuk DMqEVAUshfXmnPSJj0YuZ+LZyxYFa/ingWDc9vw96NcStTVEIJpBfToceLMVLA60eVTe PHORP8uqxwBtb/lbph1Gv3YU22R0cLblmdi6FpqxEyAKnWhM47IXMhxSwG/HAHmNWana xhcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YLTXsjKR5/Fp+NMNhjCMgTJMRXBC11wjMG3hfEw3URE=; b=4F5iIpgcivTsXuA/opy7Fp9pi+KWPboXE2N3tVWTXomS98CuL5/e5e1h9+halhMsyV N870NZ1FCFXJhjtYj/VXXQTErjACkFcubg1lbY9vgG/HYiWHkBisbnq6Jnms8d2USqb/ 6vLN+PRlrQFbE0355D5feB7yiwtIQShpBCXqccnsilAANgRJh7h6IA+D/QbR3bfZ4ZHP cP2+UQXE+w8kaXhxzfQ11enaNHuLvlJHviJUKcGhqfLVfYVYbuZrvsal58Ybe9MQincm YZStXEKnuzD3qRxlVf0eJe9WpNJ45o5ocrK89oKQAiIaMnp56a02uqJdokOwmU85kuQZ EHfg== X-Gm-Message-State: AOAM532pzncAIPicSTV1uqYgiibtl9bUOvucGDDISorqWJax8yAPNSVH ZLEkUyg0mMQSq8Hb5iHgnQJyJ5LQtqExLw== X-Received: by 2002:a17:90a:a88a:: with SMTP id h10mr11491592pjq.226.1633533616657; Wed, 06 Oct 2021 08:20:16 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id 130sm22239256pfz.77.2021.10.06.08.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 08:20:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 02/28] tests/docker: Fix fedora-i386-cross cross-compilation Date: Wed, 6 Oct 2021 08:19:48 -0700 Message-Id: <20211006152014.741026-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211006152014.741026-1-richard.henderson@linaro.org> References: <20211006152014.741026-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , "Richard W . M . Jones" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" By using PKG_CONFIG_PATH instead of PKG_CONFIG_LIBDIR, we were still including the 64-bit packages. Install pcre-devel.i686 to fill a missing glib2 dependency. By using --extra-cflags instead of --cpu, we incorrectly use the wrong probing during meson. Signed-off-by: Richard Henderson Reviewed-by: Richard W.M. Jones Reviewed-by: Daniel P. Berrangé Message-Id: <20210930163636.721311-3-richard.henderson@linaro.org> --- tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index 84f2697b6c..f62a71ce22 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -18,13 +18,14 @@ ENV PACKAGES \ glibc-static.i686 \ gnutls-devel.i686 \ nettle-devel.i686 \ + pcre-devel.i686 \ perl-Test-Harness \ pixman-devel.i686 \ sysprof-capture-devel.i686 \ zlib-devel.i686 -ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user -ENV PKG_CONFIG_PATH /usr/lib/pkgconfig +ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user +ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig RUN dnf update -y && dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt