package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch

   1 CMake: Remove dependency on gmp and libintl from FindPython.cmake
   2
   3 Downloaded from Openelec:
   4 https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-998.02-cmake-python.patch
   5
   6 The dependency for libintl and gmp was introduced by this commit
   7 https://github.com/xbmc/xbmc/commit/8558d672e98b62f3ea0126ba491376add8ed71cb
   8 without further explanation and, apparently, without necessity.
   9
  10 A question asking whether this is really needed was sent upstream:
  11 https://github.com/xbmc/xbmc/pull/10973#pullrequestreview-34179550
  12
  13 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  14
  15 diff -Naur kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake
  16 --- kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake    2017-03-20 17:17:49.000000000 +0100
  17 +++ kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake      2017-03-30 11:10:01.065718667 +0200
  18 @@ -16,14 +16,12 @@
  19  if(KODI_DEPENDSBUILD)
  20    find_library(FFI_LIBRARY ffi REQUIRED)
  21    find_library(EXPAT_LIBRARY expat REQUIRED)
  22 -  find_library(INTL_LIBRARY intl REQUIRED)
  23 -  find_library(GMP_LIBRARY gmp REQUIRED)
  24
  25    if(NOT CORE_SYSTEM_NAME STREQUAL android)
  26      set(PYTHON_DEP_LIBRARIES pthread dl util)
  27    endif()
  28
  29 -  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
  30 +  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${PYTHON_DEP_LIBRARIES})
  31  else()
  32    find_package(PythonLibs 2.7 REQUIRED)
  33    list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
  34 @@ -36,4 +34,4 @@
  35    set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
  36  endif()
  37
  38 -mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
  39 +mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY)