diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-04-22 12:01:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-04-22 15:15:16 +0200 |
| commit | 2c66156514c9fb99ac7f8f21841c2411dfcd8926 (patch) | |
| tree | 7de631552c8d89a75a600599d10f51cb5abadb39 /patches/shiboken-1.1.1 | |
| parent | 895e704354c64709c4f85e6ffd0512e7d949f9db (diff) | |
| download | ptxdist-2c66156514c9fb99ac7f8f21841c2411dfcd8926.tar.gz ptxdist-2c66156514c9fb99ac7f8f21841c2411dfcd8926.tar.xz | |
shiboken: version bump 1.0.3 -> 1.1.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/shiboken-1.1.1')
| -rw-r--r-- | patches/shiboken-1.1.1/0001-cmake-allow-specifying-the-preferred-Python-version.patch | 19 | ||||
| -rw-r--r-- | patches/shiboken-1.1.1/series | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/patches/shiboken-1.1.1/0001-cmake-allow-specifying-the-preferred-Python-version.patch b/patches/shiboken-1.1.1/0001-cmake-allow-specifying-the-preferred-Python-version.patch new file mode 100644 index 000000000..b057fd3a6 --- /dev/null +++ b/patches/shiboken-1.1.1/0001-cmake-allow-specifying-the-preferred-Python-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 Python version + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + cmake/Modules/FindPythonInterpWithDebug.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/cmake/Modules/FindPythonInterpWithDebug.cmake b/cmake/Modules/FindPythonInterpWithDebug.cmake +index 2b9cd09..7f258f4 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.1.1/series b/patches/shiboken-1.1.1/series new file mode 100644 index 000000000..249623a62 --- /dev/null +++ b/patches/shiboken-1.1.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-cmake-allow-specifying-the-preferred-Python-version.patch +# 5408a922f599a6f56593be61ee638580 - git-ptx-patches magic |