diff options
| author | Kolja Lampe <razzeee@gmail.com> | 2016-02-01 00:27:33 +0100 |
|---|---|---|
| committer | Kolja Lampe <razzeee@gmail.com> | 2016-02-02 21:05:53 +0100 |
| commit | 557eea280b7b2a8ba61cd055ab27a882b29f63ee (patch) | |
| tree | 4d67abd59ca221e59c3d66452ea8ffc9becbcfd7 /tools | |
| parent | 20ab7bd25e3401aefe344592c0556501b6365f60 (diff) | |
[depends] Bump libnfs to version 1.10.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/libnfs/Makefile | 10 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/readahead.patch | 23 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/utils.patch | 19 |
3 files changed, 4 insertions, 48 deletions
diff --git a/tools/depends/target/libnfs/Makefile b/tools/depends/target/libnfs/Makefile index 642fba8f8a..7b0db38330 100644 --- a/tools/depends/target/libnfs/Makefile +++ b/tools/depends/target/libnfs/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libnfs -VERSION=1.9.6 +VERSION=1.10.0 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -23,8 +23,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 -p0 < ../utils.patch - cd $(PLATFORM); patch -p1 < ../readahead.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) @@ -33,9 +31,9 @@ $(LIBDYLIB): $(PLATFORM) .installed-$(PLATFORM): $(LIBDYLIB) $(MAKE) -C $(PLATFORM) install ifeq ($(OS),android) - rm -f $(PREFIX)/lib/libnfs.la $(PREFIX)/lib/libnfs.so $(PREFIX)/lib/libnfs.so.4 - mv -f $(PREFIX)/lib/libnfs.so.4.3.0 $(PREFIX)/lib/libnfs.so - $(RPL) -e "libnfs.so.4" "libnfs.so\x00\x00" $(PREFIX)/lib/libnfs.so + rm -f $(PREFIX)/lib/libnfs.la $(PREFIX)/lib/libnfs.so $(PREFIX)/lib/libnfs.so.8 + mv -f $(PREFIX)/lib/libnfs.so.8.1.1 $(PREFIX)/lib/libnfs.so + $(RPL) -e "libnfs.so.8" "libnfs.so\x00\x00" $(PREFIX)/lib/libnfs.so -$(READELF) --dynamic $(PREFIX)/lib/libnfs.so | grep ibrary endif touch $@ diff --git a/tools/depends/target/libnfs/readahead.patch b/tools/depends/target/libnfs/readahead.patch deleted file mode 100644 index ae7ec4ac0a..0000000000 --- a/tools/depends/target/libnfs/readahead.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5f6442d1b24dfe98a7134ffdb5c47490f140e6e3 Mon Sep 17 00:00:00 2001 -From: Ronnie Sahlberg <ronniesahlberg@gmail.com> -Date: Fri, 5 Dec 2014 08:44:15 -0800 -Subject: [PATCH] libnfs.c: fix typo, it is readahead not readahaed - -Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> ---- - lib/libnfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/libnfs.c b/lib/libnfs.c -index 2bacd91..8a81a94 100644 ---- a/lib/libnfs.c -+++ b/lib/libnfs.c -@@ -248,7 +248,7 @@ static int nfs_set_context_args(struct nfs_context *nfs, char *arg, char *val) - rpc_set_uid(nfs_get_rpc_context(nfs), atoi(val)); - } else if (!strcmp(arg, "gid")) { - rpc_set_gid(nfs_get_rpc_context(nfs), atoi(val)); -- } else if (!strcmp(arg, "readahaed")) { -+ } else if (!strcmp(arg, "readahead")) { - rpc_set_readahead(nfs_get_rpc_context(nfs), atoi(val)); - } - return 0; diff --git a/tools/depends/target/libnfs/utils.patch b/tools/depends/target/libnfs/utils.patch deleted file mode 100644 index 9b0d21cb9a..0000000000 --- a/tools/depends/target/libnfs/utils.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- utils/nfs-ls.c.orig 2014-12-30 13:50:44.225840102 +0100 -+++ utils/nfs-ls.c 2014-12-30 13:51:03.753840180 +0100 -@@ -35,11 +35,15 @@ - #include <inttypes.h> - #include <string.h> - #include <sys/stat.h> --#include <sys/statvfs.h> - #ifndef AROS -+#ifdef ANDROID -+#define statvfs statfs -+#include <sys/vfs.h> -+#else - #include <sys/statvfs.h> - #endif - #endif -+#endif - - #ifdef HAVE_UNISTD_H - #include <unistd.h> |