X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/27ce01e83bf0264b9aed9595226ef84f07ca0f52..236d269a2b3cd3d998f7ecf41e7472f507916a29:/packages/weechat/cmake-FindPython.cmake.patch

diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch
index 100fac0a..ca7e6313 100644
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -1,18 +1,12 @@
-diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
---- ../weechat-1.3/cmake/FindPython.cmake	2015-08-16 02:27:07.000000000 -0400
-+++ ./cmake/FindPython.cmake	2016-01-03 08:11:31.987778557 -0500
-@@ -28,70 +28,11 @@
- #  PYTHON_LIBRARY = path to where libpython.so* can be found
- #  PYTHON_LFLAGS = python compiler options for linking
+diff -u -r ../weechat-1.6/cmake/FindPython.cmake ./cmake/FindPython.cmake
+--- ../weechat-1.6/cmake/FindPython.cmake	2016-10-02 03:35:04.000000000 -0400
++++ ./cmake/FindPython.cmake	2016-10-09 14:56:31.261168669 -0400
+@@ -34,64 +34,11 @@
+ endif()
  
--if(PYTHON_FOUND)
--   # Already in cache, be silent
--   set(PYTHON_FIND_QUIETLY TRUE)
--endif()
--
--if(ENABLE_PYTHON3)
+ if(ENABLE_PYTHON3)
 -  find_program(PYTHON_EXECUTABLE
--    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-    NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
 -    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
 -    )
 -else()
@@ -34,7 +28,7 @@ diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -    )
 -
 -  execute_process(
--    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
+-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))"
 -    OUTPUT_VARIABLE PYTHON_LFLAGS
 -    )
 -
@@ -44,7 +38,7 @@ diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -    )
 -  if(ENABLE_PYTHON3)
 -    find_library(PYTHON_LIBRARY
--      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-      NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
 -      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
 -      )
 -  else()
@@ -69,17 +63,11 @@ diff -u -r ../weechat-1.3/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -      set(PYTHON_FOUND TRUE)
 -    endif()
 -  endif()
-+set(PYTHON_EXECUTABLE "/data/data/com.termux/files/usr/bin/python")
-+set(PYTHON_INCLUDE_PATH "/data/data/com.termux/files/usr/include/python3.5m")
-+set(PYTHON_LIBRARY "/data/data/com.termux/files/usr/lib")
-+set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")
-+set(PYTHON_FOUND TRUE)
++  set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python")
++  set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.6m")
++  set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib")
++  set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.6m")
++  set(PYTHON_FOUND TRUE)
  
    mark_as_advanced(
      PYTHON_EXECUTABLE
-@@ -99,5 +40,3 @@
-     PYTHON_LIBRARY
-     PYTHON_LFLAGS
-     )
--
--endif()