diff options
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch | 102 |
1 files changed, 28 insertions, 74 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch index 1705abcf19..b1a99959d3 100644 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001 | 1 | From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 7 Jan 2016 18:19:03 +0000 | 3 | Date: Thu, 7 Jan 2016 18:19:03 +0000 |
4 | Subject: [PATCH] build: Add option to select libc implementation | 4 | Subject: [PATCH 1/6] build: Add option to select libc implementation |
5 | 5 | ||
6 | There are more than glibc for C library implementation available on | 6 | There are more than glibc for C library implementation available on |
7 | linux now a days, uclibc cloaked like glibc but musl e.g. is very | 7 | linux now a days, uclibc cloaked like glibc but musl e.g. is very |
@@ -11,18 +11,26 @@ Disable tests specifically not building _yet_ on musl based systems | |||
11 | 11 | ||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | 13 | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | rt_tgsigqueueinfo fails with: |
15 | rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': | ||
16 | rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct <anonymous>'} has no member named '_sifields'; did you mean '__si_fields'? | ||
17 | 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; | ||
18 | | ^~~~~~~~~ | ||
19 | | __si_fields | ||
15 | 20 | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | [ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, | ||
23 | rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, | ||
24 | testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo | ||
25 | from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] | ||
26 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> | ||
27 | Signed-off-by: Petr Vorel <pvorel@suse.cz> | ||
16 | --- | 28 | --- |
17 | Makefile | 5 +++++ | 29 | Makefile | 5 +++++ |
18 | testcases/kernel/Makefile | 5 ++++- | 30 | testcases/kernel/Makefile | 5 ++++- |
19 | testcases/kernel/sched/Makefile | 4 +++- | 31 | testcases/kernel/sched/Makefile | 4 +++- |
20 | testcases/kernel/syscalls/Makefile | 5 +++++ | 32 | testcases/kernel/syscalls/Makefile | 4 ++++ |
21 | testcases/network/nfsv4/acl/Makefile | 4 ++++ | 33 | 4 files changed, 16 insertions(+), 2 deletions(-) |
22 | testcases/network/rpc/basic_tests/Makefile | 5 +++++ | ||
23 | testcases/realtime/func/pi-tests/Makefile | 4 ++++ | ||
24 | testcases/realtime/stress/pi-tests/Makefile | 5 +++++ | ||
25 | 8 files changed, 35 insertions(+), 2 deletions(-) | ||
26 | 34 | ||
27 | diff --git a/Makefile b/Makefile | 35 | diff --git a/Makefile b/Makefile |
28 | index 768ca4606..e9d679a71 100644 | 36 | index 768ca4606..e9d679a71 100644 |
@@ -76,73 +84,19 @@ index 6a57d79ee..74bb93370 100644 | |||
76 | +endif | 84 | +endif |
77 | include $(top_srcdir)/include/mk/generic_trunk_target.mk | 85 | include $(top_srcdir)/include/mk/generic_trunk_target.mk |
78 | diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile | 86 | diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile |
79 | index 45a00cf7d..d1becd054 100644 | 87 | index 45a00cf7d..af5a591a0 100644 |
80 | --- a/testcases/kernel/syscalls/Makefile | 88 | --- a/testcases/kernel/syscalls/Makefile |
81 | +++ b/testcases/kernel/syscalls/Makefile | 89 | +++ b/testcases/kernel/syscalls/Makefile |
82 | @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) | 90 | @@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ |
83 | FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ | ||
84 | mincore mprotect nftw profil remap_file_pages sbrk | 91 | mincore mprotect nftw profil remap_file_pages sbrk |
85 | endif | 92 | endif |
86 | +ifeq ($(LIBC),musl) | ||
87 | +FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \ | ||
88 | + rt_sigsuspend setdomainname sethostname sigsuspend \ | ||
89 | + ustat | ||
90 | +endif | ||
91 | |||
92 | ifeq ($(UCLIBC),1) | ||
93 | FILTER_OUT_DIRS += profil | ||
94 | diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile | ||
95 | index 8c55a6bbd..f7cda621d 100644 | ||
96 | --- a/testcases/network/nfsv4/acl/Makefile | ||
97 | +++ b/testcases/network/nfsv4/acl/Makefile | ||
98 | @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk | ||
99 | |||
100 | LDLIBS += $(ACL_LIBS) | ||
101 | 93 | ||
102 | +ifeq ($(LIBC),musl) | 94 | +ifeq ($(LIBC),musl) |
103 | +FILTER_OUT_MAKE_TARGETS := acl1 | 95 | +FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo |
104 | +endif | 96 | +endif |
105 | + | 97 | + |
106 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | 98 | ifeq ($(UCLIBC),1) |
107 | diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile | 99 | FILTER_OUT_DIRS += profil |
108 | index 66e9d5675..ea8eb8a98 100644 | 100 | endif |
109 | --- a/testcases/network/rpc/basic_tests/Makefile | 101 | -- |
110 | +++ b/testcases/network/rpc/basic_tests/Makefile | 102 | 2.25.1 |
111 | @@ -23,4 +23,9 @@ | ||
112 | top_srcdir ?= ../../../.. | ||
113 | |||
114 | include $(top_srcdir)/include/mk/env_pre.mk | ||
115 | + | ||
116 | +ifeq ($(LIBC),musl) | ||
117 | +FILTER_OUT_DIRS += rpc01 | ||
118 | +endif | ||
119 | + | ||
120 | include $(top_srcdir)/include/mk/generic_trunk_target.mk | ||
121 | diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile | ||
122 | index 68616a711..748754bb4 100644 | ||
123 | --- a/testcases/realtime/func/pi-tests/Makefile | ||
124 | +++ b/testcases/realtime/func/pi-tests/Makefile | ||
125 | @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk | ||
126 | include $(abs_srcdir)/../../config.mk | ||
127 | |||
128 | MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex | ||
129 | +ifeq ($(LIBC),musl) | ||
130 | +FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex | ||
131 | +endif | ||
132 | + | ||
133 | |||
134 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | ||
135 | diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile | ||
136 | index 1881f7565..266e0b815 100644 | ||
137 | --- a/testcases/realtime/stress/pi-tests/Makefile | ||
138 | +++ b/testcases/realtime/stress/pi-tests/Makefile | ||
139 | @@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. | ||
140 | |||
141 | include $(top_srcdir)/include/mk/env_pre.mk | ||
142 | include $(abs_srcdir)/../../config.mk | ||
143 | + | ||
144 | +ifeq ($(LIBC),musl) | ||
145 | +FILTER_OUT_MAKE_TARGETS := testpi-3 | ||
146 | +endif | ||
147 | + | ||
148 | include $(top_srcdir)/include/mk/generic_leaf_target.mk | ||