diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2017-04-27 17:54:18 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2017-04-27 17:54:18 +0200 |
| commit | 3089ac8c1b649f305ac5b2d4c3040e4288bf4c37 (patch) | |
| tree | 9eebd985a7b38f2ad714f6dd6adedae84888397d /debian | |
| parent | 5ce9e699cdd19964bc345962af8e59e648dcbea3 (diff) | |
Add patch that force's Python 3 detection by CMake. Otherwise Cython 3 will be combined with Python 2.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/0003-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch | 36 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
2 files changed, 37 insertions, 2 deletions
diff --git a/debian/patches/0003-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch b/debian/patches/0003-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch new file mode 100644 index 00000000..431c6a5b --- /dev/null +++ b/debian/patches/0003-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch @@ -0,0 +1,36 @@ +From 719513ad96cf59e787b0d4eb96173feb527ea4ea Mon Sep 17 00:00:00 2001 +From: Gard Spreemann <gspreemann@gmail.com> +Date: Thu, 27 Apr 2017 17:39:39 +0200 +Subject: [PATCH 3/3] Force Python 3 detection to avoid mixing 2 and 3. + +--- + cmake/modules/FindCython.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/FindCython.cmake b/cmake/modules/FindCython.cmake +index 04aed1f..f3a5b7b 100644 +--- a/cmake/modules/FindCython.cmake ++++ b/cmake/modules/FindCython.cmake +@@ -24,16 +24,16 @@ + + # Use the Cython executable that lives next to the Python executable + # if it is a local installation. +-find_package( PythonInterp ) ++find_package( PythonInterp 3 ) + if( PYTHONINTERP_FOUND ) + get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH ) + find_program( CYTHON_EXECUTABLE +- NAMES cython cython.bat cython3 ++ NAMES cython3 + HINTS ${_python_path} + ) + else() + find_program( CYTHON_EXECUTABLE +- NAMES cython cython.bat cython3 ++ NAMES cython3 + ) + endif() + +-- +2.11.0 + diff --git a/debian/patches/series b/debian/patches/series index c998d3eb..b6f19e5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch -0002-Disable-tests-that-use-DFSG-deleted-data-files.patch +0003-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch |