diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2018-03-26 18:34:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 18:34:40 +0200 |
| commit | 92302d82d8ee098a4f20da8dd9c4972f597353bc (patch) | |
| tree | cd41914161afbed657497806dec81f44a12708fc | |
| parent | 3b3d34f9dad02104b982ac6c70a25768d4cba2b2 (diff) | |
| parent | 05e6b4a478184f47e90c5e5610ed044a56d66853 (diff) | |
Merge pull request #13684 from Rechi/bump/libnfs
[depends] bump libnfs to 2.0.0
| -rw-r--r-- | tools/depends/target/libnfs/Makefile | 7 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/vfstat_redefine.patch | 63 |
2 files changed, 3 insertions, 67 deletions
diff --git a/tools/depends/target/libnfs/Makefile b/tools/depends/target/libnfs/Makefile index 6d6ab8f727..bba0c1ba94 100644 --- a/tools/depends/target/libnfs/Makefile +++ b/tools/depends/target/libnfs/Makefile @@ -1,14 +1,14 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile vfstat_redefine.patch +DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libnfs -VERSION=1.10.0 +VERSION=2.0.0 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings -CONFIGURE=CFLAGS="-DHAVE_NET_IF_H" ./configure --prefix=$(PREFIX) +CONFIGURE=./configure --prefix=$(PREFIX) --disable-werror LIBDYLIB=$(PLATFORM)/lib/.libs/$(LIBNAME).a @@ -21,7 +21,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) -rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); ./bootstrap - cd $(PLATFORM); patch -p1 < ../vfstat_redefine.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/libnfs/vfstat_redefine.patch b/tools/depends/target/libnfs/vfstat_redefine.patch deleted file mode 100644 index 33ae6fa923..0000000000 --- a/tools/depends/target/libnfs/vfstat_redefine.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 41c41aec0bfd2288afde4068e433e58513268668 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf <jb@videolan.org> -Date: Fri, 11 Mar 2016 00:09:16 +0100 -Subject: [PATCH] Android: only redefine statvfs if it is not already defined - -It is defined with recent platforms version 21 and more recent ---- - lib/libnfs-sync.c | 8 ++++---- - lib/libnfs.c | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c -index 664ccfc..69caee3 100644 ---- a/lib/libnfs-sync.c -+++ b/lib/libnfs-sync.c -@@ -37,10 +37,6 @@ - #include <net/if.h> - #endif - --#ifdef __ANDROID__ --#define statvfs statfs --#endif -- - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif -@@ -49,6 +45,10 @@ - #include <sys/statvfs.h> - #endif - -+#if defined(__ANDROID__) && !defined(HAVE_SYS_STATVFS_H) -+#define statvfs statfs -+#endif -+ - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> - #endif -diff --git a/lib/libnfs.c b/lib/libnfs.c -index 1f16e5f..36c1430 100644 ---- a/lib/libnfs.c -+++ b/lib/libnfs.c -@@ -33,10 +33,6 @@ - #include <utime.h> - #endif - --#ifdef __ANDROID__ --#define statvfs statfs --#endif -- - #define _GNU_SOURCE - - #ifdef HAVE_UNISTD_H -@@ -51,6 +47,10 @@ - #include <sys/statvfs.h> - #endif - -+#if defined(__ANDROID__) && !defined(HAVE_SYS_STATVFS_H) -+#define statvfs statfs -+#endif -+ - #ifdef HAVE_NETINET_IN_H - #include <netinet/in.h> - #endif |