[Buildroot] [git commit branch/2018.08.x] package/libnfs: add patch to fix musl build issue

Peter Korsgaard peter at korsgaard.com
Sun Nov 25 21:32:42 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=11c3b3c07ab8689ed265532b284ed694139dd0fa
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2018.08.x

Add a patch to fix build issues with the musl C library.

This patch fixes an autobuild issue when linking the mpd package
against libnfs. The header file libnfs.h uses `struct timeval` which is
defined in `<sys/time.h>` for POSIX systems. Unfortunately, upstream
only includes it conditionally, based on the system. Therefore, we
remove the check in the first patch.

Reported upstream:
https://github.com/sahlberg/libnfs/issues/272

Fixes:
http://autobuild.buildroot.org/results/452/4522014698b9fe50720a71b663e47a75805bcf54
http://autobuild.buildroot.org/results/b0a/b0a0c20ad1705e9fa7ba4a12eb9c182e8077ab0c
http://autobuild.buildroot.org/results/53c/53c87361923cc177de7889523b3d16ba6b1d3d0f
.. and more.

Previous patch: Changes requested
http://patchwork.ozlabs.org/patch/973605/

Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit 582fd7c094c697a3408c054b87406fcf249bcf72)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/libnfs/0001-Fix-include-sys-time.h.patch | 41 ++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch
new file mode 100644
index 0000000000..15b281672a
--- /dev/null
+++ b/package/libnfs/0001-Fix-include-sys-time.h.patch
@@ -0,0 +1,41 @@
+From 9df082012cba1dc32d83e5e8b0bdc0892f250058 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause at embedded.rocks>
+Date: Mon, 5 Nov 2018 00:43:07 +0100
+Subject: [PATCH] Fix include sys/time.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+POSIX says `struct timeval` is defined if <sys/time.h> is included.
+
+Instead of the mess that is currently done based on the system on which
+the stuff is being compiled, include it unconditionally.
+
+Reported upstream:
+https://github.com/sahlberg/libnfs/issues/272
+
+Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>
+---
+ include/nfsc/libnfs.h | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
+index 09dcf1c..b6db58c 100755
+--- a/include/nfsc/libnfs.h
++++ b/include/nfsc/libnfs.h
+@@ -24,12 +24,7 @@
+ #define _LIBNFS_H_
+ 
+ #include <stdint.h>
+-#if defined(__ANDROID__) || defined(AROS) \
+- || ( defined(__APPLE__) && defined(__MACH__) )
+ #include <sys/time.h>
+-#else
+-#include <time.h>
+-#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+-- 
+2.19.1
+


More information about the buildroot mailing list