[Buildroot] [PATCH 1/1] package/libnfs: bump to version 5.0.2
Fabrice Fontaine
fontaine.fabrice at gmail.com
Sun Oct 1 14:52:04 UTC 2023
- Update patch
- Handle pthread support added with
https://github.com/sahlberg/libnfs/commit/f55637619ecbeb7c7bbd4143768b6b45100be86c
https://github.com/sahlberg/libnfs/blob/libnfs-5.0.2/CHANGELOG
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
.checkpackageignore | 1 -
package/libnfs/0001-Fix-include-sys-time.h.patch | 9 +++++----
package/libnfs/libnfs.hash | 2 +-
package/libnfs/libnfs.mk | 8 +++++++-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.checkpackageignore b/.checkpackageignore
index 95695fa243..445bd63827 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -716,7 +716,6 @@ package/libmpeg2/0004-fix-sparc.patch Upstream
package/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-cross-build.patch Upstream
package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch Upstream
package/libnfc/0001-autotools-make-example-build-optional.patch Upstream
-package/libnfs/0001-Fix-include-sys-time.h.patch Upstream
package/libnids/0001-libpcap-use-pkg-config.patch Upstream
package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch Upstream
package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch Upstream
diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch
index 15b281672a..c3779f13a2 100644
--- a/package/libnfs/0001-Fix-include-sys-time.h.patch
+++ b/package/libnfs/0001-Fix-include-sys-time.h.patch
@@ -11,10 +11,11 @@ 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
+Upstream: https://github.com/sahlberg/libnfs/issues/272
Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>
+[Fabrice: update for 5.0.2]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
include/nfsc/libnfs.h | 5 -----
1 file changed, 5 deletions(-)
@@ -27,8 +28,8 @@ index 09dcf1c..b6db58c 100755
#define _LIBNFS_H_
#include <stdint.h>
--#if defined(__ANDROID__) || defined(AROS) \
-- || ( defined(__APPLE__) && defined(__MACH__) )
+-#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \
+- || ( defined(__APPLE__) && defined(__MACH__) ) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/time.h>
-#else
-#include <time.h>
diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash
index ffb6c62073..b67a5d2eda 100644
--- a/package/libnfs/libnfs.hash
+++ b/package/libnfs/libnfs.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d libnfs-4.0.0.tar.gz
+sha256 637e56643b19da9fba98f06847788c4dad308b723156a64748041035dcdf9bd3 libnfs-5.0.2.tar.gz
sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING
sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt
diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk
index 173b2c5b06..8dc4d8f545 100644
--- a/package/libnfs/libnfs.mk
+++ b/package/libnfs/libnfs.mk
@@ -4,11 +4,17 @@
#
################################################################################
-LIBNFS_VERSION = 4.0.0
+LIBNFS_VERSION = 5.0.2
LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION))
LIBNFS_INSTALL_STAGING = YES
LIBNFS_AUTORECONF = YES
LIBNFS_LICENSE = LGPL-2.1+ (library), BSD-2-Clause (protocol, .x files), GPL-3.0+ (examples)
LIBNFS_LICENSE_FILES = COPYING LICENCE-BSD.txt LICENCE-LGPL-2.1.txt LICENCE-GPL-3.txt
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIBNFS_CONF_OPTS += --enable-threads
+else
+LIBNFS_CONF_OPTS += --disable-threads
+endif
+
$(eval $(autotools-package))
--
2.40.1
More information about the buildroot
mailing list