Merge pull request #1696 from MilhouseVH/libnfs_2.0.0

libnfs: update to libnfs-2.0.0
This commit is contained in:
Christian Hewitt 2017-07-01 10:47:25 +04:00 committed by GitHub
commit 630ec83c57
2 changed files with 1 additions and 42 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libnfs"
PKG_VERSION="1.11.0"
PKG_VERSION="2.0.0"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/sahlberg/libnfs"

View File

@ -1,41 +0,0 @@
From 5b28ab5d535e0252c05640eef6e280581278dc36 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 9 May 2017 14:30:14 -0700
Subject: [PATCH] Include sys/sysmacros.h on platforms that have it
This addresses issue 202
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
---
configure.ac | 4 ++++
lib/libnfs.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ad7e63f..574aa4a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,10 @@ esac
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AC_SUBST([LIBSOCKET])
+# check for sys/sysmacros.h
+dnl Check for sys/sysmacros.h
+AC_CHECK_HEADERS([sys/sysmacros.h])
+
# check for poll.h
dnl Check for poll.h
AC_CHECK_HEADERS([poll.h])
diff --git a/lib/libnfs.c b/lib/libnfs.c
index d7a3d49..880ba85 100755
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -71,7 +71,7 @@
#include <sys/mkdev.h>
#endif
-#ifdef MAJOR_IN_SYSMACROS
+#ifdef HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
#endif