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 /lib | |
parent | c8e583d76b68f896e3f4ef8a322f1598d00e219e (diff) |
[libnfs] - version bump to new api and new buildsys
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libnfs/Makefile | 13 | ||||
-rw-r--r-- | lib/libnfs/printf.patch | 12 |
2 files changed, 3 insertions, 22 deletions
diff --git a/lib/libnfs/Makefile b/lib/libnfs/Makefile index 9a7d706fa1..cc3e4220c8 100644 --- a/lib/libnfs/Makefile +++ b/lib/libnfs/Makefile @@ -6,7 +6,7 @@ # lib name, version LIBNAME=libnfs -VERSION=0977fbb +VERSION=9f88cb0 SOURCE=$(LIBNAME)-$(VERSION) # download location and format BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs @@ -16,10 +16,9 @@ RETRIEVE_TOOL=/usr/bin/curl RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf -prefix=/usr # configuration settings -CONFIGURE=./configure --prefix=$(prefix) --without-examples --without-ldconfig +CONFIGURE=./configure SO_NAME=$(SOURCE)/lib/libnfs.so @@ -34,25 +33,19 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) rm -rf $(SOURCE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore - cd $(SOURCE);autoreconf -vif;$(CONFIGURE) - cd $(SOURCE); patch -p0 < ../printf.patch + cd $(SOURCE);./bootstrap;$(CONFIGURE) $(SO_NAME): $(SOURCE) make -C $(SOURCE) install: make -C $(SOURCE) install - rm -f $(prefix)/lib/libnfs.so - rm -f $(prefix)/lib/libnfs.so.1 - ln -s $(prefix)/lib/libnfs.so.1.0.0 $(prefix)/lib/libnfs.so - ln -s $(prefix)/lib/libnfs.so.1.0.0 $(prefix)/lib/libnfs.so.1 clean: make -C $(SOURCE) clean rm -f .installed rm -f -r include rm -f -r lib rm -f *.tar.gz - rm -r -f Memphiz-libnfs* rm -r -f nfsc distclean:: diff --git a/lib/libnfs/printf.patch b/lib/libnfs/printf.patch deleted file mode 100644 index 2cdf264c6c..0000000000 --- a/lib/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; |