From nobody Mon Nov 17 09:48:39 2025 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=1603720961; cv=none; d=zohomail.com; s=zohoarc; b=XiP8fEW7ERp9zu9kMQG9vTvUXRLn2NgiamYeCNTF7+wCzQr3yC1xXOet1GVjg4HFaBC26o3pHHqrjEUdmPgtYipLjSdbwf5dxg9buqgDAvcYr3WwGBiBM7F0grnKwC3hC6vFCHmVMjanG57DWa0M0sQ8lVWtqYedyctoiOfl54U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603720961; 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=jmqeimzHMB012rfAVLqb0I9/4/X5Fdg6WEMvNReylTc=; b=emnuDHn6/Fe7jVL3XTaBz3ygfAbPtSonKLt1Q91wX6NyBRSmp5KR8mfEAJOpL0Lm4st3x1JY+q2GuX/xGLcoLDHzJGHEWXti+mJMvL41GZ1+RAjFO4oFjSqg6JCp5RkkQBWk8TbBm5tlGvziRWQZw3YuM9VK6YjcQddUu4bsS8g= 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 1603720961200797.9845799021347; Mon, 26 Oct 2020 07:02:41 -0700 (PDT) Received: from localhost ([::1]:36354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX355-0001KI-Gw for importer@patchew.org; Mon, 26 Oct 2020 10:02:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2uo-0005if-I3 for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:52:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX2uW-0001kg-Mf for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:52:01 -0400 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-306-0C3LqNcuOGu9WXCpofHOPw-1; Mon, 26 Oct 2020 09:51:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 430EC876E3D; Mon, 26 Oct 2020 13:51:32 +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 E83006EF78; Mon, 26 Oct 2020 13:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603720296; 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=jmqeimzHMB012rfAVLqb0I9/4/X5Fdg6WEMvNReylTc=; b=eHLtU1jM8ZiJp61JGhfz7DOEKboWuSHrHmdPis9QoCeTGsFhiqWywg3AK9dHmNJ/DFWxm7 A60fJwXVi6pEdC620/i/SRVJpDQ04IBPdPTRsGSkMPGBp9q5dWKxDWVfTYNZibl8Tpz175 rojPvnwgyU7u4ursLpZaigkEiwU7+WM= X-MC-Unique: 0C3LqNcuOGu9WXCpofHOPw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/17] build: fix macOS --enable-modules build Date: Mon, 26 Oct 2020 09:51:15 -0400 Message-Id: <20201026135131.3006712-2-pbonzini@redhat.com> In-Reply-To: <20201026135131.3006712-1-pbonzini@redhat.com> References: <20201026135131.3006712-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/25 21:03:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Emmanuel Blot 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" Apple's nm implementation includes empty lines in the output that are not found in GNU binutils. This confuses scripts/undefsym.py, though it did not confuse the scripts/undefsym.sh script that it replaced. To fix this, ignore lines that do not have two fields. Reported-by: Emmanuel Blot Tested-by: Emmanuel Blot Fixes: 604f3e4e90 ("meson: Convert undefsym.sh to undefsym.py", 2020-09-08) Signed-off-by: Paolo Bonzini --- .cirrus.yml | 2 +- scripts/undefsym.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 81a2960b1a..900437dd2a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -40,7 +40,7 @@ macos_xcode_task: script: - mkdir build - cd build - - ../configure --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations' + - ../configure --extra-cflags=3D'-Wno-error=3Ddeprecated-declarations'= --enable-modules --enable-werror --cc=3Dclang || { cat config.log meson-= logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check V=3D1 diff --git a/scripts/undefsym.py b/scripts/undefsym.py index 69a895cd26..4b6a72d95f 100644 --- a/scripts/undefsym.py +++ b/scripts/undefsym.py @@ -15,12 +15,11 @@ def filter_lines_set(stdout, from_staticlib): linesSet =3D set() for line in stdout.splitlines(): tokens =3D line.split(b' ') - if len(tokens) >=3D 1: - if len(tokens) > 1: - if from_staticlib and tokens[1] =3D=3D b'U': - continue - if not from_staticlib and tokens[1] !=3D b'U': - continue + if len(tokens) >=3D 2: + if from_staticlib and tokens[1] =3D=3D b'U': + continue + if not from_staticlib and tokens[1] !=3D b'U': + continue new_line =3D b'-Wl,-u,' + tokens[0] if not new_line in linesSet: linesSet.add(new_line) --=20 2.26.2