X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c1cf6ad7ad258b0bb539599ca306c1eae240e120..dd6f8fa7dfb2546c73b82c101d125129eea621f5:/packages/weechat/cmake-FindPython.cmake.patch

diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch
index 0546912e..a2e5158a 100644
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -1,15 +1,10 @@
-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.5/cmake/FindPython.cmake ./cmake/FindPython.cmake
+--- ../weechat-1.5/cmake/FindPython.cmake	2016-05-01 06:50:12.000000000 -0400
++++ ./cmake/FindPython.cmake	2016-05-03 04:00:56.742055189 -0400
+@@ -33,65 +33,11 @@
+    set(PYTHON_FIND_QUIETLY TRUE)
+ endif()
  
--if(PYTHON_FOUND)
--   # Already in cache, be silent
--   set(PYTHON_FIND_QUIETLY TRUE)
--endif()
--
 -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
@@ -34,7 +29,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
 -    )
 -
@@ -69,17 +64,16 @@ 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")
++set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python")
++set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.5m")
++set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib")
++set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")
 +set(PYTHON_FOUND TRUE)
  
    mark_as_advanced(
      PYTHON_EXECUTABLE
-@@ -99,5 +40,3 @@
-     PYTHON_LIBRARY
+@@ -100,4 +46,3 @@
      PYTHON_LFLAGS
      )
--
+ 
 -endif()