From nobody Fri May 3 10:23:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606400765; cv=none; d=zohomail.com; s=zohoarc; b=U3kmA8oHpT0syC0wFiJ2rMdkZOIBB/uEJusKmccMwn5wtMN2ADTDy4k+HPbZNIC5jZwf+5Fubc5+qMO3PX8FdlDRD6ZF/UhYbMv1rV8Cjy313bFGp97yzIQd2S04yRTm94jSnjl4LNPHfqw0QjjTZXYs+2Ug5J/EankzvqRWDR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606400765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D2aLyrM1tfSGtiUWdWept7ozELi7c+yJBSlVcGctauk=; b=E+BKXX/wU6DeFkYyTnqXAZf1XIIs2CFxu6PPSwdeZ0OjOvVRKwJ/BpPPlBZBwlpNfgA3UCY96Yz1TlaiFaDnbhbh2ISoOa9BVieFffKp+v8Yka96iWXnN8/rma3x3ST7cYitwJ7zgUGbTssqH5dZj1pObU4LAcsPy2D+ywFdQGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606400765114772.9809336916893; Thu, 26 Nov 2020 06:26:05 -0800 (PST) Received: from localhost ([::1]:43570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiIDj-0000i5-VZ for importer@patchew.org; Thu, 26 Nov 2020 09:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiIAG-0004UU-73 for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiIAC-0005mm-LK for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-161-tB6T3UoxMj-Jm7zQqsIUvQ-1; Thu, 26 Nov 2020 09:22:20 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D782A8144E8; Thu, 26 Nov 2020 14:22:19 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 949C610013C0; Thu, 26 Nov 2020 14:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606400544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D2aLyrM1tfSGtiUWdWept7ozELi7c+yJBSlVcGctauk=; b=J7w+5aNvy+S7hWDSG3vhkxovQS7MRkr8jIVQWCGvMpp3Qhs3+e+9lCWlD+eynsnG7NR7FA zWJ9/nTl/HjWR3+CRdXugu229qXSa6qcR9bzLhEskIpeSiGcQYfi/aLOSn0bz9/lzecBYX 5lSxDvbOjku1kbHQxqLsxqgjVE9TmhU= X-MC-Unique: tB6T3UoxMj-Jm7zQqsIUvQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/4] meson: use dependency() to find libjpeg Date: Thu, 26 Nov 2020 09:22:15 -0500 Message-Id: <20201126142218.3121595-2-pbonzini@redhat.com> In-Reply-To: <20201126142218.3121595-1-pbonzini@redhat.com> References: <20201126142218.3121595-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Prefer pkg-config to find_library because some installations of libjpeg may place it outside the default search path. Reported-by: Stefan Weil Signed-off-by: Paolo Bonzini --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 5062407c70..360623ece9 100644 --- a/meson.build +++ b/meson.build @@ -654,9 +654,8 @@ if get_option('vnc').enabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', static: enable_static) - jpeg =3D cc.find_library('jpeg', has_headers: ['jpeglib.h'], - required: get_option('vnc_jpeg'), - static: enable_static) + jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), + method: 'pkg-config', static: enable_static) sasl =3D cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], required: get_option('vnc_sasl'), static: enable_static) --=20 2.26.2 From nobody Fri May 3 10:23:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606400654; cv=none; d=zohomail.com; s=zohoarc; b=UhTaIwrUTngLoT49dEXeH2IcTKffjOmxikQ4WFmDhnPOP/ZHlKk754Kv/3GbyC/7nbkGFO6YiwuYXTf+kbBBt0BWJyVkllkHNbuMSUTvvskGybwNfIjJIBvf3Vhoxt96Fo77iM6pyLGCAQB8z9ThH78oGnt7MPkdgq1ItNseZ+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606400654; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2v4a8dtkHjMlGEaKD3psu8JUdLX0AIWK/wxoBPTbn2Y=; b=ZVHmuUiaBYaGl2lZNDK7z1mpvyI30FjFk9vJvHThWO+ae/cv8Mk5hgz8Tg/ewyalFQEHBF5/zcR9XZpDzx0J0toLfd+dOkAQyp4Etn+sicCW0O4seNSOGt8zYt/2+TRt55giLOTy5w0yuunevnxpJB9OASQPH0oaz+7Qw0Nxolk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606400654581680.500844405248; Thu, 26 Nov 2020 06:24:14 -0800 (PST) Received: from localhost ([::1]:36222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiIBw-00064U-LJ for importer@patchew.org; Thu, 26 Nov 2020 09:24:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiIAF-0004T6-4I for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiIAC-0005mh-KW for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:26 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-xnRmLIXfOXytmsUGVPM1Xg-1; Thu, 26 Nov 2020 09:22:21 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F702100A65B; Thu, 26 Nov 2020 14:22:20 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id F378C10013C0; Thu, 26 Nov 2020 14:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606400543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2v4a8dtkHjMlGEaKD3psu8JUdLX0AIWK/wxoBPTbn2Y=; b=Cnw7d+LbLxIsKwVyQ5EH0mtbjnsdmnPPjHSshnS5qaOs95TdQ9WJltdRVQ/9mKFY9P0WNW FPGrH0FqxpriK6321CiQLj5ft30s8eAtbL+VvJ9y5Rx5cjH5lv6jrHRYqCGdNJT63BTK1K lz0+6wXTLvf5lwsU7Tb54cQcSk2lbL0= X-MC-Unique: xnRmLIXfOXytmsUGVPM1Xg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/4] configure: remove python pkg_resources check Date: Thu, 26 Nov 2020 09:22:16 -0500 Message-Id: <20201126142218.3121595-3-pbonzini@redhat.com> In-Reply-To: <20201126142218.3121595-1-pbonzini@redhat.com> References: <20201126142218.3121595-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Olaf Hering , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Olaf Hering Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not = required anymore. Signed-off-by: Olaf Hering Reviewed-by: Thomas Huth Message-Id: <20201124211925.4194-1-olaf@aepfle.de> Signed-off-by: Paolo Bonzini --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure index 796cec14de..18c26e0389 100755 --- a/configure +++ b/configure @@ -1912,9 +1912,6 @@ fi =20 case "$meson" in git | internal) - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then - error_exit "Python setuptools not found" - fi meson=3D"$python ${source_path}/meson/meson.py" ;; *) meson=3D$(command -v "$meson") ;; --=20 2.26.2 From nobody Fri May 3 10:23:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606400657; cv=none; d=zohomail.com; s=zohoarc; b=BL/e6YWv20fQtTq/Uqdom0CP0nn9MfvdRvWI2guZM7NtxbiD9RM0nl8NGCGGtuitRPbakx/P8S+Dg+A/cJAk9Q0lC6RYCfIlaM0IfPGbB/JJO4S6FS4DwlXG9PDq7MN41sS+8ggqVCm3qSoyNv98szyip+gJUuz67PcZtUhDizM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606400657; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=WEFrf5nG0IXjhVqRQtxq2jRJOMJ0Af0XPT3Ct5Gp3kCsT/sebuGU1/sHW3FlJZtDjgdDErED4boP048BUjPMZQ6Xt407g9TkfcTXMQzat/drjQqDqgZtIOXR2K7HSlrXz2zuqu1IB4QDgfMYsVglsupoY6K8A51UGhPqI5vkGgU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606400657250933.6750216857832; Thu, 26 Nov 2020 06:24:17 -0800 (PST) Received: from localhost ([::1]:36548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiIC0-0006CO-0n for importer@patchew.org; Thu, 26 Nov 2020 09:24:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiIAG-0004VW-QA for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiIAD-0005n2-Rl for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-ITLUI4qlNymT8E8I7HRjAA-1; Thu, 26 Nov 2020 09:22:21 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCE5C5720C for ; Thu, 26 Nov 2020 14:22:20 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7949910013C0; Thu, 26 Nov 2020 14:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606400545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=Z/v07afBoz+hGKUq5G8qY1syEFTLn/QRvILj62ig6voHK63O15dSRljQgYpN+103KQA/F5 ZTT2gTrjACz1TFK0qn3cb8fVnNGknjjsU5Bn1dlQcr3lUERClDPYKsQgTnpXzggo9gj4KP RD2t3y29R9zbvuCpYonUDEpnkI3zwnU= X-MC-Unique: ITLUI4qlNymT8E8I7HRjAA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/4] tests/docker, tests/vm: remove setuptools from images Date: Thu, 26 Nov 2020 09:22:17 -0500 Message-Id: <20201126142218.3121595-4-pbonzini@redhat.com> In-Reply-To: <20201126142218.3121595-1-pbonzini@redhat.com> References: <20201126142218.3121595-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Setuptools is not needed anymore by the bundled copy of meson, remove it. Suggested-by: Thomas Huth Signed-off-by: Paolo Bonzini --- .cirrus.yml | 1 - tests/docker/dockerfiles/debian10.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/vm/freebsd | 1 - tests/vm/haiku.x86_64 | 1 - tests/vm/netbsd | 1 - tests/vm/openbsd | 1 - 8 files changed, 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f0209b7a3e..2e45b3254f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -85,7 +85,6 @@ windows_msys2_task: C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --need= ed \ diffutils git grep make pkg-config sed \ mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-setuptools \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2_image \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index 21cc671d71..73a3caac9c 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -30,7 +30,6 @@ RUN apt update && \ pkg-config \ psmisc \ python3 \ - python3-setuptools \ python3-sphinx \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) =20 diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 5903e1b0b4..087df598a0 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -30,7 +30,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 7f03cd8ffc..d5d2f5f00d 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -26,7 +26,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 04ee793381..09f3ee6cb8 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM): "pkgconf", "bzip2", "python37", - "py37-setuptools", "ninja", =20 # gnu tools diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 37af48bf1b..2eb736dae1 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM): "devel:libusb_1.0", "devel:libz", "ninja", - "setuptools_python3" ] =20 # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 596717cc76..b9efc269d2 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM): "pkgconf", "xz", "python37", - "py37-setuptools", "ninja-build", =20 # gnu tools diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 386b2c72f7..4d1399378e 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM): "git", "pkgconf", "bzip2", "xz", - "py3-setuptools", "ninja", =20 # gnu tools --=20 2.26.2 From nobody Fri May 3 10:23:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606400689; cv=none; d=zohomail.com; s=zohoarc; b=hLuG7vgMFwAtldWH7TwzgMcT5mHqZ4AXtN+IQ22lEOr5RaIyJjJmj56tqrviOIA8iYLzGd0MYlhhKpbbvcvI/yO/kPalXQKxDafFAzdHmvjESQlYTR6JX9YAysCqfD8Kgslyi2zsuIqGJGTHIAnNjzjzJQ6agCOOLGLWEqRfhmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606400689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Iscxj1bJF1udx8dBwJ7KFfb3EmPFrugWzsS5Mh1Qmxo=; b=HIksSNtzgYgEcvUJFx1/HPiAZVFBzAINNTMygwiB+H2IVRODzw2koyOi+FUmlpecTe3Ax+9ffsb2HMvHxa6VwyPpLV4A7cXOyEG+tSQaN0jmniAANDOalEwjZbmUM75XCDZuLnTjcj4RWhkpRvBVpNNMVPwur54sMnAAs34KoDE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606400689628255.70628700093528; Thu, 26 Nov 2020 06:24:49 -0800 (PST) Received: from localhost ([::1]:39706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiICW-0007UW-Hf for importer@patchew.org; Thu, 26 Nov 2020 09:24:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiIAH-0004Xj-Vp for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiIAG-0005oB-BI for qemu-devel@nongnu.org; Thu, 26 Nov 2020 09:22:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-kPXfknQPOneOB0JOkuY8GQ-1; Thu, 26 Nov 2020 09:22:25 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4910E8144E2; Thu, 26 Nov 2020 14:22:24 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D930210013C0; Thu, 26 Nov 2020 14:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606400547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Iscxj1bJF1udx8dBwJ7KFfb3EmPFrugWzsS5Mh1Qmxo=; b=eVKBZq4n38swroENuFXtTkfKjAzviIxYpIL59j7IhdY8HKYDgwy4dA9BaNpvn/i4dRowAi 1H/VxyK5D7Xm+pA6XVjRJLyTKKUq2bigQ0Qtzt7ZckXzSweP3c9sn/I8dJrv9zbq2T/2qS 2FCQhHrAaQ8qiIRVUBeAvZYMzJQF2Fg= X-MC-Unique: kPXfknQPOneOB0JOkuY8GQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/4] nsis: Fix build for 64 bit installer Date: Thu, 26 Nov 2020 09:22:18 -0500 Message-Id: <20201126142218.3121595-5-pbonzini@redhat.com> In-Reply-To: <20201126142218.3121595-1-pbonzini@redhat.com> References: <20201126142218.3121595-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Stefan Weil , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Weil Pass cpu instead of cpu_family to the NSIS installer script. That script checks for "x86_64" which is the cpu value, while cpu_family is "x86". Signed-off-by: Stefan Weil Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20201125191833.964753-1-sw@weilnetz.de> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 360623ece9..e3386196ba 100644 --- a/meson.build +++ b/meson.build @@ -1955,7 +1955,7 @@ if host_machine.system() =3D=3D 'windows' '@OUTPUT@', get_option('prefix'), meson.current_source_dir(), - host_machine.cpu_family(), + host_machine.cpu(), '--', '-DDISPLAYVERSION=3D' + meson.project_version(), ] --=20 2.26.2