All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Cc: Romain Naour <romain.naour@gmail.com>,
	Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build
Date: Mon, 23 May 2022 23:14:16 +0200	[thread overview]
Message-ID: <20220523211416.1500310-1-fontaine.fabrice@gmail.com> (raw)

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

             reply	other threads:[~2022-05-23 21:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-23 21:14 Fabrice Fontaine [this message]
2022-05-29 21:06 ` [Buildroot] [PATCH 1/1] package/qemu: fix musl and uclibc-ng build Romain Naour
2022-05-29 21:17 ` Yann E. MORIN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220523211416.1500310-1-fontaine.fabrice@gmail.com \
    --to=fontaine.fabrice@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=romain.naour@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.