Patchwork [4/7] busybox: add fix for build issue with recent C libraries

login
register
mail settings
Submitter Thomas Petazzoni
Date Oct. 28, 2012, 4:40 p.m.
Message ID <1351442438-20639-5-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/194721/
State Rejected
Headers show

Comments

Thomas Petazzoni - Oct. 28, 2012, 4:40 p.m.
The AArch64 toolchain uses a recent C library, which requires a build
fix in Busybox, which has been sent upstream but hasn't been merged
yet.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../busybox-1.20.2-fix-resource-h-failure.patch    |   30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/busybox/busybox-1.20.2/busybox-1.20.2-fix-resource-h-failure.patch

Patch

diff --git a/package/busybox/busybox-1.20.2/busybox-1.20.2-fix-resource-h-failure.patch b/package/busybox/busybox-1.20.2/busybox-1.20.2-fix-resource-h-failure.patch
new file mode 100644
index 0000000..7667640
--- /dev/null
+++ b/package/busybox/busybox-1.20.2/busybox-1.20.2-fix-resource-h-failure.patch
@@ -0,0 +1,30 @@ 
+On a system running glibc trunk busybox doesn't compile:
+
+loginutils/passwd.c: In function ‘passwd_main’:
+loginutils/passwd.c:104:16: error: storage size of ‘rlimit_fsize’ isn’t known
+loginutils/passwd.c:188:2: warning: implicit declaration of function ‘setrlimit’ [-Wimplicit-function-declaration]
+loginutils/passwd.c:188:12: error: ‘RLIMIT_FSIZE’ undeclared (first use in this function)
+loginutils/passwd.c:188:12: note: each undeclared identifier is reported only once for each function it appears in
+loginutils/passwd.c:104:16: warning: unused variable ‘rlimit_fsize’ [-Wunused-variable]
+...
+miscutils/time.c:23:16: error: field ‘ru’ has incomplete type
+
+Fix this by including sys/resource.h.
+
+Signed-off-by: Markus Trippelsdorf <markus at trippelsdorf.de>
+---
+ include/libbb.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/libbb.h b/include/libbb.h
+index f12800f..e7806c2 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -40,6 +40,7 @@
+ #include <sys/poll.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <sys/resource.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>