78c96bc324
- Add csync-libssh.patch: Detect libssh version in libssh_version.h in case this file exists. NOTE: there are so many things wrong in this package, I did not even dare looking at it any closer :) OBS-URL: https://build.opensuse.org/request/show/844264 OBS-URL: https://build.opensuse.org/package/show/network:synchronization:files/csync?expand=0&rev=54
42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake
|
|
===================================================================
|
|
--- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake
|
|
+++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake
|
|
@@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
|
|
|
|
find_path(LIBSSH_INCLUDE_DIR
|
|
NAMES
|
|
- libssh/libssh.h
|
|
+ libssh/libssh_version.h
|
|
PATHS
|
|
/usr/include
|
|
/usr/local/include
|
|
@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
|
|
)
|
|
|
|
if (LibSSH_FIND_VERSION)
|
|
- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
|
|
+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
|
|
REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
|
|
# Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
|
|
if (LIBSSH_VERSION_MAJOR)
|
|
string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
|
|
- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
|
|
+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
|
|
REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
|
|
string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
|
|
- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
|
|
+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
|
|
REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
|
|
string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
|
|
|
|
@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
|
|
include(FindPackageVersionCheck)
|
|
find_package_version_check(LibSSH DEFAULT_MSG)
|
|
else (LIBSSH_VERSION_MAJOR)
|
|
- message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
|
|
+ message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
|
|
set(LIBSSH_FOUND FALSE)
|
|
endif (LIBSSH_VERSION_MAJOR)
|
|
endif (LibSSH_FIND_VERSION)
|