On 07/20/2017 06:28 PM, William Allen Simpson wrote:
I've updated my patch to do the same thing as Niels. But this is
inherently unsatisfying. What we really might need is to split
@NTIRPC_VERSION_EMBED@ into two strings for V2.6 going forward:
@NTIRPC_PATCH_VERSION_EMBED@
@NTIRPC_MINOR_VERSION_EMBED@
Or something like it. I'll talk with DanG about it for next week.
Obviously, we don't want to disturb V2.5 unnecessarily.
There's also a line hard checking against >= 1.6.0, which should be
using a symbol as well? Or is it just too much trouble, and we like
hard coded versions? Just have to remember and find them all?
Hi, Bill.
I've written (and Matt has pulled) a small patch to ntirpc to add an ABI
version. If you could update your pullup to that, and add the attached
patch, that should fix your problem.
Daniel
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb1b54f..2b655b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -883,7 +883,7 @@ if(USE_9P_RDMA)
link_directories (${MOOSHIKA_LIBRARY_DIRS})
endif(USE_9P_RDMA)
-set(NTIRPC_MIN_VERSION 1.5.0)
+set(NTIRPC_MIN_VERSION 1.6.0)
if (USE_SYSTEM_NTIRPC)
find_package(NTIRPC ${NTIRPC_MIN_VERSION} REQUIRED)
else (USE_SYSTEM_NTIRPC)
diff --git a/src/nfs-ganesha.spec-in.cmake b/src/nfs-ganesha.spec-in.cmake
index 40453a7..5927d8d 100644
--- a/src/nfs-ganesha.spec-in.cmake
+++ b/src/nfs-ganesha.spec-in.cmake
@@ -509,7 +509,7 @@ exit 0
%{_bindir}/ganesha.nfsd
%if ! %{with system_ntirpc}
%{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@
-%{_libdir}/libntirpc.so.1.5
+%{_libdir}/libntirpc.so.@NTIRPC_ABI_EMBED@
%{_libdir}/libntirpc.so
%{_libdir}/pkgconfig/libntirpc.pc
%{_includedir}/ntirpc/
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Nfs-ganesha-devel mailing list
Nfs-ganesha-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
