diff options
| author | Robin van der Gracht <robin@protonic.nl> | 2018-01-31 12:16:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-01 11:56:10 +0100 |
| commit | eb3135421484501f9a3a8603b8c659a4710f2bbb (patch) | |
| tree | 49bfecaaa2e8d1ddd21e8f9e728261e4bfb8ba1a /patches/shiboken-1.2.2 | |
| parent | dfd19f2946abbb86df9230c6ee7d03491b8199a7 (diff) | |
| download | ptxdist-eb3135421484501f9a3a8603b8c659a4710f2bbb.tar.gz ptxdist-eb3135421484501f9a3a8603b8c659a4710f2bbb.tar.xz | |
python3-shiboken: new package
The patches directory patches/shiboken-1.2.2 is ready and compile-time
tested with python2 and python3. Because we could not really test
shiboken 1.2.2 (python2), we did not do a version bump for it.
Signed-off-by: Robin van der Gracht <robin@protonic.nl>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/shiboken-1.2.2')
3 files changed, 71 insertions, 0 deletions
diff --git a/patches/shiboken-1.2.2/0001-cmake-allow-specifying-the-preferred-Python2-version.patch b/patches/shiboken-1.2.2/0001-cmake-allow-specifying-the-preferred-Python2-version.patch new file mode 100644 index 000000000..2a7dd2232 --- /dev/null +++ b/patches/shiboken-1.2.2/0001-cmake-allow-specifying-the-preferred-Python2-version.patch @@ -0,0 +1,19 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 15 Mar 2012 08:55:26 +0100 +Subject: [PATCH] cmake: allow specifying the preferred Python2 version + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + cmake/Modules/FindPythonInterpWithDebug.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/Modules/FindPythonInterpWithDebug.cmake b/cmake/Modules/FindPythonInterpWithDebug.cmake +index 7722d956917e..06c5aff02580 100644 +--- a/cmake/Modules/FindPythonInterpWithDebug.cmake ++++ b/cmake/Modules/FindPythonInterpWithDebug.cmake +@@ -1,4 +1,4 @@ +-find_program(PYTHON_EXECUTABLE NAMES python2.7 python2.6 python2.5) ++find_program(PYTHON_EXECUTABLE NAMES ${Python_PREFERRED_VERSION} python2.7 python2.6 python2.5) + + if (NOT PYTHON_EXECUTABLE) + find_package(PythonInterp REQUIRED) diff --git a/patches/shiboken-1.2.2/0002-cmake-allow-specifying-the-preferred-Python3-version.patch b/patches/shiboken-1.2.2/0002-cmake-allow-specifying-the-preferred-Python3-version.patch new file mode 100644 index 000000000..2d985e42d --- /dev/null +++ b/patches/shiboken-1.2.2/0002-cmake-allow-specifying-the-preferred-Python3-version.patch @@ -0,0 +1,47 @@ +From: Bastian Stender <bst@pengutronix.de> +Date: Fri, 26 Jan 2018 14:27:23 +0100 +Subject: [PATCH] cmake: allow specifying the preferred Python3 version + +Signed-off-by: Bastian Stender <bst@pengutronix.de> +--- + cmake/Modules/FindPython3Interp.cmake | 4 ++-- + cmake/Modules/FindPython3Libs.cmake | 4 +++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cmake/Modules/FindPython3Interp.cmake b/cmake/Modules/FindPython3Interp.cmake +index 373982e210a3..ad38c6697bc8 100644 +--- a/cmake/Modules/FindPython3Interp.cmake ++++ b/cmake/Modules/FindPython3Interp.cmake +@@ -20,7 +20,7 @@ + # License text for the above reference.) + + FIND_PROGRAM(PYTHON3_EXECUTABLE +- NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3 ++ NAMES ${Python3_PREFERRED_VERSION} python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3 + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath] +@@ -28,7 +28,7 @@ FIND_PROGRAM(PYTHON3_EXECUTABLE + ) + + FIND_PROGRAM(PYTHON3_DBG_EXECUTABLE +- NAMES python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg ++ NAMES ${Python3_PREFERRED_VERSION} python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath] +diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake +index 20a82ba07d59..e1789438a4b9 100644 +--- a/cmake/Modules/FindPython3Libs.cmake ++++ b/cmake/Modules/FindPython3Libs.cmake +@@ -27,7 +27,9 @@ INCLUDE(CMakeFindFrameworks) + # Search for the python framework on Apple. + # CMAKE_FIND_FRAMEWORKS(Python) + +-FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) ++STRING(REPLACE "python" "" Python3_PREFERRED_VERSION_NUMBER ${Python3_PREFERRED_VERSION}) ++ ++FOREACH(_CURRENT_VERSION ${Python3_PREFERRED_VERSION_NUMBER} 3.4 3.3 3.2 3.1 3.0) + IF(_CURRENT_VERSION GREATER 3.1) + SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") + ELSE() diff --git a/patches/shiboken-1.2.2/series b/patches/shiboken-1.2.2/series new file mode 100644 index 000000000..35630db2b --- /dev/null +++ b/patches/shiboken-1.2.2/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-cmake-allow-specifying-the-preferred-Python2-version.patch +0002-cmake-allow-specifying-the-preferred-Python3-version.patch +# 51481bffa6f992fb0f955bd13139b6db - git-ptx-patches magic |