[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/9] configure/meson: Only check sys/signal.h on non-Linux
From: |
Jiaxun Yang |
Subject: |
[PATCH 3/9] configure/meson: Only check sys/signal.h on non-Linux |
Date: |
Mon, 21 Dec 2020 08:53:12 +0800 |
signal.h is equlevant of sys/signal.h on Linux, musl would complain
wrong usage of sys/signal.h.
In file included from /builds/FlyGoat/qemu/include/qemu/osdep.h:108,
from ../tests/qemu-iotests/socket_scm_helper.c:13:
/usr/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include
<sys/signal.h> to <signal.h> [-Werror=cpp]
1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
| ^~~~~~~
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 372576f82c..1ef8722b3a 100644
--- a/meson.build
+++ b/meson.build
@@ -841,7 +841,10 @@ config_host_data.set('HAVE_DRM_H',
cc.has_header('libdrm/drm.h'))
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h'))
-config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
+if targetos != 'linux'
+ # signal.h is equlevant of sys/signal.h on Linux
+ config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
+endif
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST',
'CONFIG_BDRV_RO_WHITELIST']
--
2.29.2
- [PATCH 0/9] Alpine Linux build fix and CI pipeline, Jiaxun Yang, 2020/12/20
- [PATCH 1/9] tests/docker: Add dockerfile for Alpine Linux, Jiaxun Yang, 2020/12/20
- [PATCH 2/9] configure: Add sys/timex.h to probe clk_adjtime, Jiaxun Yang, 2020/12/20
- [PATCH 3/9] configure/meson: Only check sys/signal.h on non-Linux,
Jiaxun Yang <=
- [PATCH 4/9] libvhost-user: Include poll.h instead of sys/poll.h, Jiaxun Yang, 2020/12/20
- [PATCH 5/9] elf2dmp: Rename PAGE_SIZE to ELF2DMP_PAGE_SIZE, Jiaxun Yang, 2020/12/20
- [PATCH 6/9] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE, Jiaxun Yang, 2020/12/20
- [PATCH 7/9] accel/kvm: avoid using predefined PAGE_SIZE, Jiaxun Yang, 2020/12/20
- [PATCH 8/9] tests: Rename PAGE_SIZE definitions, Jiaxun Yang, 2020/12/20
- [PATCH 9/9] gitlab-ci: Add alpine to pipeline, Jiaxun Yang, 2020/12/20