* [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build
@ 2022-05-23 21:14 Fabrice Fontaine
2022-05-29 21:06 ` Romain Naour
2022-05-29 21:17 ` Yann E. MORIN
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-05-23 21:14 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Fabrice Fontaine
Fix the following musl and uclibc-ng build failure raised since bump to
version 7.0.0 in commit 3fa79c038ec75228015ea0022de80c5e7a2003f8 and
https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
../linux-user/syscall.c: In function 'target_to_host_resource':
../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
1057 | return RLIMIT_RTTIME;
| ^~~~~~~~~~~~~
| RLIMIT_NOFILE
Fixes:
- http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...ll.c-fix-build-without-RLIMIT_RTTIME.patch | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
diff --git a/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
new file mode 100644
index 0000000000..729c2e9be8
--- /dev/null
+++ b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
@@ -0,0 +1,48 @@
+From 84863e007d4ef0858e74a1250e2472954924c617 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sat, 14 May 2022 16:10:16 +0200
+Subject: [PATCH] linux-user/syscall.c: fix build without RLIMIT_RTTIME
+
+RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version
+1.2.0 and
+https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09
+resulting in the following build failure since
+https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
+
+../linux-user/syscall.c: In function 'target_to_host_resource':
+../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
+ 1057 | return RLIMIT_RTTIME;
+ | ^~~~~~~~~~~~~
+ | RLIMIT_NOFILE
+
+Fixes:
+ - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://patchwork.ozlabs.org/project/qemu-devel/patch/20220523105239.1499162-1-fontaine.fabrice@gmail.com]
+---
+Changes v1 -> v2 (after review of Laurent Vivier):
+ - Use an ifdef block instead of defining RLIMIT_RTTIME
+
+ linux-user/syscall.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index dd0d92ba4e..488facb356 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code)
+ return RLIMIT_RSS;
+ case TARGET_RLIMIT_RTPRIO:
+ return RLIMIT_RTPRIO;
++#ifdef RLIMIT_RTTIME
+ case TARGET_RLIMIT_RTTIME:
+ return RLIMIT_RTTIME;
++#endif
+ case TARGET_RLIMIT_SIGPENDING:
+ return RLIMIT_SIGPENDING;
+ case TARGET_RLIMIT_STACK:
+--
+2.35.1
+
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build
2022-05-23 21:14 [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build Fabrice Fontaine
@ 2022-05-29 21:06 ` Romain Naour
2022-05-29 21:17 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Romain Naour @ 2022-05-29 21:06 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
Hello Fabrice,
Le 23/05/2022 à 23:14, Fabrice Fontaine a écrit :
> Fix the following musl and uclibc-ng build failure raised since bump to
> version 7.0.0 in commit 3fa79c038ec75228015ea0022de80c5e7a2003f8 and
> https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
>
> ../linux-user/syscall.c: In function 'target_to_host_resource':
> ../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
> 1057 | return RLIMIT_RTTIME;
> | ^~~~~~~~~~~~~
> | RLIMIT_NOFILE
>
> Fixes:
> - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Note: The latest release of uClibc-ng contains RLIMIT_RTTIME:
https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=ca4b8182186b246f925ada5eb22bf49a04249358
Best regards,
Romain
> ---
> ...ll.c-fix-build-without-RLIMIT_RTTIME.patch | 48 +++++++++++++++++++
> 1 file changed, 48 insertions(+)
> create mode 100644 package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
>
> diff --git a/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
> new file mode 100644
> index 0000000000..729c2e9be8
> --- /dev/null
> +++ b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
> @@ -0,0 +1,48 @@
> +From 84863e007d4ef0858e74a1250e2472954924c617 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sat, 14 May 2022 16:10:16 +0200
> +Subject: [PATCH] linux-user/syscall.c: fix build without RLIMIT_RTTIME
> +
> +RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version
> +1.2.0 and
> +https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09
> +resulting in the following build failure since
> +https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
> +
> +../linux-user/syscall.c: In function 'target_to_host_resource':
> +../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
> + 1057 | return RLIMIT_RTTIME;
> + | ^~~~~~~~~~~~~
> + | RLIMIT_NOFILE
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status:
> +https://patchwork.ozlabs.org/project/qemu-devel/patch/20220523105239.1499162-1-fontaine.fabrice@gmail.com]
> +---
> +Changes v1 -> v2 (after review of Laurent Vivier):
> + - Use an ifdef block instead of defining RLIMIT_RTTIME
> +
> + linux-user/syscall.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> +index dd0d92ba4e..488facb356 100644
> +--- a/linux-user/syscall.c
> ++++ b/linux-user/syscall.c
> +@@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code)
> + return RLIMIT_RSS;
> + case TARGET_RLIMIT_RTPRIO:
> + return RLIMIT_RTPRIO;
> ++#ifdef RLIMIT_RTTIME
> + case TARGET_RLIMIT_RTTIME:
> + return RLIMIT_RTTIME;
> ++#endif
> + case TARGET_RLIMIT_SIGPENDING:
> + return RLIMIT_SIGPENDING;
> + case TARGET_RLIMIT_STACK:
> +--
> +2.35.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build
2022-05-23 21:14 [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build Fabrice Fontaine
2022-05-29 21:06 ` Romain Naour
@ 2022-05-29 21:17 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2022-05-29 21:17 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Romain Naour, buildroot
Fabrice, All,
On 2022-05-23 23:14 +0200, Fabrice Fontaine spake thusly:
> Fix the following musl and uclibc-ng build failure raised since bump to
> version 7.0.0 in commit 3fa79c038ec75228015ea0022de80c5e7a2003f8 and
> https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
>
> ../linux-user/syscall.c: In function 'target_to_host_resource':
> ../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
> 1057 | return RLIMIT_RTTIME;
> | ^~~~~~~~~~~~~
> | RLIMIT_NOFILE
>
> Fixes:
> - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...ll.c-fix-build-without-RLIMIT_RTTIME.patch | 48 +++++++++++++++++++
> 1 file changed, 48 insertions(+)
> create mode 100644 package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
>
> diff --git a/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
> new file mode 100644
> index 0000000000..729c2e9be8
> --- /dev/null
> +++ b/package/qemu/0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch
> @@ -0,0 +1,48 @@
> +From 84863e007d4ef0858e74a1250e2472954924c617 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sat, 14 May 2022 16:10:16 +0200
> +Subject: [PATCH] linux-user/syscall.c: fix build without RLIMIT_RTTIME
> +
> +RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version
> +1.2.0 and
> +https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09
> +resulting in the following build failure since
> +https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
> +
> +../linux-user/syscall.c: In function 'target_to_host_resource':
> +../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
> + 1057 | return RLIMIT_RTTIME;
> + | ^~~~~~~~~~~~~
> + | RLIMIT_NOFILE
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status:
> +https://patchwork.ozlabs.org/project/qemu-devel/patch/20220523105239.1499162-1-fontaine.fabrice@gmail.com]
> +---
> +Changes v1 -> v2 (after review of Laurent Vivier):
> + - Use an ifdef block instead of defining RLIMIT_RTTIME
> +
> + linux-user/syscall.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> +index dd0d92ba4e..488facb356 100644
> +--- a/linux-user/syscall.c
> ++++ b/linux-user/syscall.c
> +@@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code)
> + return RLIMIT_RSS;
> + case TARGET_RLIMIT_RTPRIO:
> + return RLIMIT_RTPRIO;
> ++#ifdef RLIMIT_RTTIME
> + case TARGET_RLIMIT_RTTIME:
> + return RLIMIT_RTTIME;
> ++#endif
> + case TARGET_RLIMIT_SIGPENDING:
> + return RLIMIT_SIGPENDING;
> + case TARGET_RLIMIT_STACK:
> +--
> +2.35.1
> +
> --
> 2.35.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-29 21:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-23 21:14 [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build Fabrice Fontaine
2022-05-29 21:06 ` Romain Naour
2022-05-29 21:17 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.