|
 |
e5872a |
--- nfs-ganesha-3.0/src/CMakeLists.txt.orig 2019-11-13 14:52:54.092000000 +0000
|
|
|
e5872a |
+++ nfs-ganesha-3.0/src/CMakeLists.txt 2019-11-13 14:50:16.240000000 +0000
|
|
|
e5872a |
@@ -1005,6 +1005,7 @@
|
|
|
e5872a |
|
|
|
e5872a |
set(NTIRPC_MIN_VERSION 3.0)
|
|
|
e5872a |
if (USE_SYSTEM_NTIRPC)
|
|
|
e5872a |
+ set(NTIRPC_INCLUDE_DIR "/usr/include/ntirpc/")
|
|
|
e5872a |
find_package(NTIRPC ${NTIRPC_MIN_VERSION} REQUIRED)
|
|
|
e5872a |
if (USE_LTTNG)
|
|
|
e5872a |
set(NTIRPC_LIBRARY ${NTIRPC_LIBRARY} ${NTIRPC_LTTNG})
|
|
|
e5872a |
--- nfs-ganesha-3.0/src/cmake/modules/FindNTIRPC.cmake.orig 2019-11-13 18:28:28.028000000 +0000
|
|
|
e5872a |
+++ nfs-ganesha-3.0/src/cmake/modules/FindNTIRPC.cmake 2019-11-13 18:30:26.280000000 +0000
|
|
|
e5872a |
@@ -46,15 +46,18 @@
|
|
|
e5872a |
|
|
|
e5872a |
if (NOT NTIRPC_LIBRARY_DIR)
|
|
|
e5872a |
find_path(NTIRPC_LIBRARY_DIR
|
|
|
e5872a |
- NAMES libntirpc.so
|
|
|
e5872a |
+ NAMES libntirpc.so
|
|
|
e5872a |
PATHS ${NTIRPC_PREFIX}
|
|
|
e5872a |
- PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib lib64
|
|
|
e5872a |
+ PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib lib64
|
|
|
e5872a |
DOC "The NTIRPC libraries")
|
|
|
e5872a |
endif (NOT NTIRPC_LIBRARY_DIR)
|
|
|
e5872a |
|
|
|
e5872a |
-find_library(NTIRPC_LIBRARY ntirpc PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
|
|
|
e5872a |
-find_library(NTIRPC_TRACEPOINTS ntirpc_tracepoints PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
|
|
|
e5872a |
-find_library(NTIRPC_LTTNG ntirpc_lttng PATHS ${NTIRPC_LIBRARY_DIR} NO_DEFAULT_PATH)
|
|
|
e5872a |
+find_library(NTIRPC_LIBRARY ntirpc
|
|
|
e5872a |
+ PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
|
|
|
e5872a |
+find_library(NTIRPC_TRACEPOINTS ntirpc_tracepoints
|
|
|
e5872a |
+ PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
|
|
|
e5872a |
+find_library(NTIRPC_LTTNG ntirpc_lttng
|
|
|
e5872a |
+ PATHS_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
|
|
|
e5872a |
|
|
|
e5872a |
set(NTIRPC_VERSION_HEADER "${NTIRPC_INCLUDE_DIR}/version.h")
|
|
|
e5872a |
if (EXISTS ${NTIRPC_VERSION_HEADER})
|