[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/17] build: fix macOS --enable-modules build
From: |
Paolo Bonzini |
Subject: |
[PULL 01/17] build: fix macOS --enable-modules build |
Date: |
Mon, 26 Oct 2020 09:51:15 -0400 |
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 <eblot.ml@gmail.com>
Tested-by: Emmanuel Blot <eblot.ml@gmail.com>
Fixes: 604f3e4e90 ("meson: Convert undefsym.sh to undefsym.py", 2020-09-08)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.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='-Wno-error=deprecated-declarations'
+ - ../configure --extra-cflags='-Wno-error=deprecated-declarations'
--enable-modules
--enable-werror --cc=clang || { cat config.log
meson-logs/meson-log.txt; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check V=1
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 = set()
for line in stdout.splitlines():
tokens = line.split(b' ')
- if len(tokens) >= 1:
- if len(tokens) > 1:
- if from_staticlib and tokens[1] == b'U':
- continue
- if not from_staticlib and tokens[1] != b'U':
- continue
+ if len(tokens) >= 2:
+ if from_staticlib and tokens[1] == b'U':
+ continue
+ if not from_staticlib and tokens[1] != b'U':
+ continue
new_line = b'-Wl,-u,' + tokens[0]
if not new_line in linesSet:
linesSet.add(new_line)
--
2.26.2
- [PULL 04/17] hw/core/qdev-clock: add a reference on aliased clocks, (continued)
- [PULL 04/17] hw/core/qdev-clock: add a reference on aliased clocks, Paolo Bonzini, 2020/10/26
- [PULL 05/17] qtest: unbreak non-TCG builds in bios-tables-test, Paolo Bonzini, 2020/10/26
- [PULL 02/17] meson: rewrite curses/iconv test, Paolo Bonzini, 2020/10/26
- [PULL 07/17] Remove deprecated -no-kvm option, Paolo Bonzini, 2020/10/26
- [PULL 06/17] replay: do not build if TCG is not available, Paolo Bonzini, 2020/10/26
- [PULL 17/17] machine: move SMP initialization from vl.c, Paolo Bonzini, 2020/10/26
- [PULL 12/17] configure: move install_blobs from configure to meson, Paolo Bonzini, 2020/10/26
- [PULL 15/17] machine: remove deprecated -machine enforce-config-section option, Paolo Bonzini, 2020/10/26
- [PULL 13/17] WHPX: Fix WHPX build break, Paolo Bonzini, 2020/10/26
- [PULL 11/17] configure: remove unused variable from config-host.mak, Paolo Bonzini, 2020/10/26
- [PULL 01/17] build: fix macOS --enable-modules build,
Paolo Bonzini <=
[PULL 14/17] win32: boot broken when bind & data dir are the same, Paolo Bonzini, 2020/10/26
[PULL 09/17] configure: allow configuring localedir, Paolo Bonzini, 2020/10/26
[PULL 16/17] machine: move UP defaults to class_base_init, Paolo Bonzini, 2020/10/26
[PULL 10/17] configure: move directory options from config-host.mak to meson, Paolo Bonzini, 2020/10/26
Re: [PULL 00/17] Build system changes and misc fixes for QEMU 5.2 soft freeze, Peter Maydell, 2020/10/26