From a695f2f78f330e77e6031b6dd7e14b9b8b951277 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 11 Jan 2017 12:21:54 -0800 Subject: [PATCH] kodi: update smbclient static linking patch --- ...00.22-allow-static-smbclient-linking.patch | 51 +++++++------------ 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch b/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch index 655eafc2ff..44b9d5864c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.22-allow-static-smbclient-linking.patch @@ -1,6 +1,7 @@ -diff -Naur a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake ---- a/project/cmake/modules/FindSmbClient.cmake 2016-09-17 08:35:33.000000000 -0700 -+++ b/project/cmake/modules/FindSmbClient.cmake 2016-09-25 13:38:38.969125892 -0700 +diff --git a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake +index 6455cce..379d79c 100644 +--- a/project/cmake/modules/FindSmbClient.cmake ++++ b/project/cmake/modules/FindSmbClient.cmake @@ -14,7 +14,7 @@ # # SmbClient::SmbClient - The SmbClient library @@ -10,40 +11,24 @@ diff -Naur a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/F pkg_check_modules(PC_SMBCLIENT smbclient QUIET) endif() -@@ -23,15 +23,35 @@ - find_library(SMBCLIENT_LIBRARY NAMES smbclient - PATHS ${PC_SMBCLIENT_LIBDIR}) - -+# check if smbclient libs are statically linked -+set(SMBCLIENT_LIB_TYPE SHARED) -+if(PC_SMBCLIENT_STATIC_LDFLAGS) -+ set(SMBCLIENT_LDFLAGS ${PC_SMBCLIENT_STATIC_LDFLAGS} CACHE STRING "smbclient linker flags" FORCE) -+ set(SMBCLIENT_LIB_TYPE STATIC) -+# string(REGEX REPLACE ";" " " SMBCLIENT_STATIC_LIBRARIES ${PC_SMBCLIENTS_STATIC_LIBRARIES}) -+# foreach(_smblib IN LISTS ${SMBCLIENT_STATIC_LIBRARIES}) -+# string(TOUPPER ${_smblib}_LIBRARY SMBCLIENT_STATIC_LIBRARIES) -+# find_library(${SMBCLIENT_STATIC_LIBRARIES} ${_smblib}) -+# endforeach() -+ -+ find_library(TALLOC_LIBRARY talloc) -+ find_library(TDB_LIBRARY tdb) -+ find_library(TEVENT_LIBRARY tevent) -+ find_library(WBCLIENT_LIBRARY wbclient) -+ find_library(RESOLV_LIBRARY resolv) -+ -+endif() -+ - set(SMBCLIENT_VERSION ${PC_SMBCLIENT_VERSION}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SmbClient - REQUIRED_VARS SMBCLIENT_LIBRARY SMBCLIENT_INCLUDE_DIR -+ TALLOC_LIBRARY TDB_LIBRARY TEVENT_LIBRARY WBCLIENT_LIBRARY RESOLV_LIBRARY +@@ -31,7 +31,19 @@ find_package_handle_standard_args(SmbClient VERSION_VAR SMBCLIENT_VERSION) if(SMBCLIENT_FOUND) - set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY}) -+ set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY} ${TALLOC_LIBRARY} ${TDB_LIBRARY} ${TEVENT_LIBRARY} ${WBCLIENT_LIBRARY} ${RESOLV_LIBRARY}) ++ # check if smbclient libs are statically linked ++ set(SMBCLIENT_LIB_TYPE SHARED) ++ if(PC_SMBCLIENT_STATIC_LDFLAGS) ++ set(SMBCLIENT_LDFLAGS ${PC_SMBCLIENT_STATIC_LDFLAGS} CACHE STRING "smbclient linker flags" FORCE) ++ set(SMBCLIENT_LIB_TYPE STATIC) ++ find_library(TALLOC_LIBRARY talloc) ++ find_library(TDB_LIBRARY tdb) ++ find_library(TEVENT_LIBRARY tevent) ++ find_library(WBCLIENT_LIBRARY wbclient) ++ find_library(RESOLV_LIBRARY resolv) ++ set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY} ${TALLOC_LIBRARY} ${TDB_LIBRARY} ${TEVENT_LIBRARY} ${WBCLIENT_LIBRARY} ${RESOLV_LIBRARY}) ++ endif() ++ set(SMBCLIENT_INCLUDE_DIRS ${SMBCLIENT_INCLUDE_DIR}) set(SMBCLIENT_DEFINITIONS -DHAVE_LIBSMBCLIENT=1)