diff options
| author | Memphiz <memphis@machzwo.de> | 2011-07-18 23:38:47 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2011-07-18 23:38:47 +0200 |
| commit | 43a13d3bf8eaf49da153a697cb8f0a63f63aba8f (patch) | |
| tree | 34fa050a8e08c4720175252918d71074c8f191e5 /tools | |
| parent | c8e583d76b68f896e3f4ef8a322f1598d00e219e (diff) | |
[libnfs] - version bump to new api and new buildsys
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/libnfs/Makefile | 10 | ||||
| -rw-r--r-- | tools/darwin/depends/libnfs/printf.patch | 12 |
2 files changed, 3 insertions, 19 deletions
diff --git a/tools/darwin/depends/libnfs/Makefile b/tools/darwin/depends/libnfs/Makefile index ce2ec98441..d4e2c2fa60 100644 --- a/tools/darwin/depends/libnfs/Makefile +++ b/tools/darwin/depends/libnfs/Makefile @@ -3,16 +3,15 @@ include ../config.site.mk # lib name, version LIBNAME=libnfs -VERSION=0977fbb +VERSION=9f88cb0 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --without-examples +CONFIGURE=./configure --prefix=$(PREFIX) RPC_HEADERS=rpcinc/auth.h rpcinc/auth_unix.h rpcinc/clnt.h rpcinc/pmap_clnt.h rpcinc/pmap_prot.h rpcinc/pmap_rmt.h rpcinc/rpc.h rpcinc/rpc_msg.h rpcinc/svc.h rpcinc/svc_auth.h rpcinc/types.h rpcinc/xdr.h -DYLIBNAME=libnfs.1.0.0.dylib LIBDYLIB=$(SOURCE)/lib/$(DYLIBNAME) CLEAN_FILES=$(ARCHIVE) $(SOURCE) @@ -28,17 +27,14 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore mkdir -p $(PREFIX)/include/rpc install -c -m 644 $(RPC_HEADERS) $(PREFIX)/include/rpc/ - cd $(SOURCE); ./autogen.sh + cd $(SOURCE); ./bootstrap cd $(SOURCE); $(CONFIGURE) - cd $(SOURCE); patch -p0 < ../printf.patch $(LIBDYLIB): $(SOURCE) make -C $(SOURCE) .installed: make -C $(SOURCE) install - rm -f $(PREFIX)/lib/libnfs.dylib - ln -s $(PREFIX)/lib/$(DYLIBNAME) $(PREFIX)/lib/libnfs.dylib touch $@ clean: make -C $(SOURCE) clean diff --git a/tools/darwin/depends/libnfs/printf.patch b/tools/darwin/depends/libnfs/printf.patch deleted file mode 100644 index 2cdf264c6c..0000000000 --- a/tools/darwin/depends/libnfs/printf.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/libnfs-sync.c 2011-06-11 01:23:58.000000000 +0200 -+++ lib/libnfs-sync.c 2011-06-13 15:04:59.000000000 +0200 -@@ -34,6 +34,9 @@ - #include "libnfs-raw-mount.h" - #include "libnfs-raw-nfs.h" - -+#undef printf -+int printf(const char* str, ...){return 0;} -+ - struct sync_cb_data { - int is_finished; - int status; |