diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-09-22 16:46:48 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-09-23 08:32:20 +1000 |
| commit | 8a2eb45973ec5fc2feaf96082571d32677182d9e (patch) | |
| tree | ebf333736b4e631f5f4da42b3b7583709619362f /tools/depends/target/libnfs | |
| parent | 54703a9a753e32eff935ebc5534fd13a12f36b78 (diff) | |
[depends] Bump nfs 5.0.2
Diffstat (limited to 'tools/depends/target/libnfs')
| -rw-r--r-- | tools/depends/target/libnfs/001-fix-cmake-build.patch | 25 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/LIBNFS-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/Makefile | 4 |
3 files changed, 3 insertions, 30 deletions
diff --git a/tools/depends/target/libnfs/001-fix-cmake-build.patch b/tools/depends/target/libnfs/001-fix-cmake-build.patch deleted file mode 100644 index fe59fffca5..0000000000 --- a/tools/depends/target/libnfs/001-fix-cmake-build.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/cmake/Macros.cmake -+++ b/cmake/Macros.cmake -@@ -12,4 +12,12 @@ - add_library(${name} OBJECT ${SOURCES} ${HEADERS}) - target_include_directories(${name} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) - set(CORE_LIBRARIES "${name};${CORE_LIBRARIES}" CACHE INTERNAL "") -+ -+ # no need to install core libs if we build shared library -+ if(NOT BUILD_SHARED_LIBS) -+ install(TARGETS ${name} EXPORT libnfs -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+ endif() - endfunction() ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -116,6 +116,7 @@ - - install(FILES mount/libnfs-raw-mount.h - nfs/libnfs-raw-nfs.h -+ nfs4/libnfs-raw-nfs4.h - nlm/libnfs-raw-nlm.h - nsm/libnfs-raw-nsm.h - portmap/libnfs-raw-portmap.h diff --git a/tools/depends/target/libnfs/LIBNFS-VERSION b/tools/depends/target/libnfs/LIBNFS-VERSION index 78eeba0792..892aa7afcf 100644 --- a/tools/depends/target/libnfs/LIBNFS-VERSION +++ b/tools/depends/target/libnfs/LIBNFS-VERSION @@ -1,6 +1,6 @@ LIBNAME=libnfs -VERSION=5.0.1 +VERSION=5.0.2 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf +SHA512=6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5 BYPRODUCT=libnfs.a BYPRODUCT_WIN=nfs.lib diff --git a/tools/depends/target/libnfs/Makefile b/tools/depends/target/libnfs/Makefile index ee8bb3048b..0029cda86a 100644 --- a/tools/depends/target/libnfs/Makefile +++ b/tools/depends/target/libnfs/Makefile @@ -1,6 +1,5 @@ include ../../Makefile.include LIBNFS-VERSION ../../download-files.include -DEPS= ../../Makefile.include Makefile LIBNFS-VERSION ../../download-files.include \ - 001-fix-cmake-build.patch +DEPS= ../../Makefile.include Makefile LIBNFS-VERSION ../../download-files.include # configuration settings CMAKE_OPTIONS=-DBUILD_SHARED_LIBS=OFF \ @@ -17,7 +16,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) -rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); mkdir -p build - cd $(PLATFORM); patch -p1 -i ../001-fix-cmake-build.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) |