From patchwork Tue Jul 23 10:36:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169497 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8703859ilk; Tue, 23 Jul 2019 03:37:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzm2kb6BQOEN/BQzxpSC78YDe+AbMk9IfIryiuNWg5XPBt5bB9psP1yuPGBVeqOgfMp0NtC X-Received: by 2002:a05:620a:16da:: with SMTP id a26mr50630400qkn.376.1563878261156; Tue, 23 Jul 2019 03:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878261; cv=none; d=google.com; s=arc-20160816; b=gm2vNSKfIAG8LmifKGiU7lxj9sf/P0BI+JyQBCDfBW2uhCrQsBGW4IwJG+BeLv9rhF R+3DSwv05EU1A1hRlcn+Zdd1WoQZiB0zrx5i5VgnGa96yFXeORtMhBHMJxLyV/8kEoDd hYGR6OCS6BD5Gmgci5frGT6lbpuz676PWgWlM+ulDfQ8zorpX5ZlZQEs8uYECfEU3c5k uaCEjesZ8S6AB3FaEjY7ToijTASDAPl8NsW/sp/Mnfx6scCIDNuvkG0yL+j26Wje9qX+ kV5DIHKm1Gj/dJpdr4iwI1RlRB5rAbFfcXotf4yGyOi951JK8L9caBX4FZ945/6Najy8 lBBg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=PpJ4poHE/Bo/S9THDeiUma8mO768bU57ebcewncMLG07PD0Se+Ih6WcVG0syidz79b rDW9k+dcTmtj6mjAszYvibfa6gS3lSBTlv47/3oHMWmxUEAaG0hQ38+NX63EtcZb8QUx k6rf2Et0Jqa6JHOetW9myzBT1FlQbN5lY5sw6tSgmsYpzk/nTWEAFnDI02zLCE/rXrbH 5/HPHj4IXs+rg63l2Wherg5MrejkwX0nwEr3MUDfoHA2oGJh9xAJj7WNxzVmt3jK2Pha aEw59nBlRCc7XdwD80nEng7xCockipUD/XaKCpXCMq4SrFXz0DcQHK8UoJzet5HsDrDr 56yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eH2WthkL; 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 m51si31138883qvc.179.2019.07.23.03.37.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:37:41 -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=eH2WthkL; 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]:40998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsAu-000200-4l for patch@linaro.org; Tue, 23 Jul 2019 06:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37867) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hps9f-00062l-Li for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hps9e-0007Qe-EW for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:23 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:51654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hps9e-0007Ps-6M for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:36:22 -0400 Received: by mail-wm1-x334.google.com with SMTP id 207so37997938wma.1 for ; Tue, 23 Jul 2019 03:36:22 -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=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=eH2WthkLzyGU16o9xEWncuRO4tvUzNNBDoLToReS6mv5R8SiGxMd7WitV8HyWr8dt6 tF8vIsmgcPs65EERTAHBrBRyMwSG1TCj9yfMyaVEi0uxVJuD536Ehi3r/oCxChyWi3Kh 4HfnF3FhhRUPo1sHJaliaDfCjvvDa8y94WgHIEhWoBmlePvoZH/zcsN3ilezH2+ciTAY NUeJKwAsTcwyB7SH/Z5vO+7OapuyGrfNCR/DERBpUtKZ+Vd4+f+oOb4OOlhCL+p6+Pr7 p0LSQHmnTVpbZWMZ8z6vp+Mt6XoWduSrdxeJX2jm7h2UiRxUv56ZqAAGWx5c1wCta9gH 0Sqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HQyqOz02G3bFziBv9m62IDtJiMAsZS66su/354KrNr8=; b=azvYwQ5dSsOGy+Em5PO/1Sm6xGlpjHl7yjppVlwBEt2imBbE5WOhI085pbZK6JU/qd JPOrN6qUpLo7RWpIsOjzGfNRia067loXPZ8iwAtxKk0yK7EA77JYLix9tOv6LwctcYef SCwGP7vmPDnWPJ+2vAphjGXuEmfjkCt+gfyBZ1dFVQMXLgcWqdPaDflla9es3O020Vzr AqKbH/HPW13aMYbFr2ZbYx/Fbyk6cSbY2MI+zNlSYBTfC9a49HloAccoaoIz3E61Fh1M tu9sZq1gjViAxdPgVSfYqptHuOBjaog5iL4qZZIyJqEQj1i2QPqDeBYg76s7NsOFWEdp fNZA== X-Gm-Message-State: APjAAAWJowbNq56SCA57Cfs0UOghslq8A/KcLI2LmxoZEgzXobrADvDe 2UJpEW98eZN20IhiBtDkKgepIg== X-Received: by 2002:a05:600c:230c:: with SMTP id 12mr66522064wmo.166.1563878181134; Tue, 23 Jul 2019 03:36:21 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x83sm43239980wmb.42.2019.07.23.03.36.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:36:19 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B2261FF9B; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:00 +0100 Message-Id: <20190723103612.5600-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This silents a bunch of warnings while compiling the Slirp objects: $ make [...] CC slirp/src/tftp.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found CC slirp/src/udp6.o Package glib-2.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `glib-2.0.pc' to the PKG_CONFIG_PATH environment variable No package 'glib-2.0' found [...] Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-5-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker index 77f5cc45e92..dc74ce7e0e0 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -11,6 +11,9 @@ ENV TARGET i686 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \ diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index 3908c5abc42..df7bfce7eab 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -11,6 +11,9 @@ ENV TARGET x86-64 ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin +ENV PKG_CONFIG_PATH \ + $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig + RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ mxe-$TARGET-w64-mingw32.shared-bzip2 \