[Python-modules-commits] r24759 - in packages/shiboken/trunk/debian (3 files)

[odyx at users.alioth.debian.org]

    Date: Wednesday, June 12, 2013 @ 12:59:13
  Author: odyx
Revision: 24759

Update patches to ensure that the Python3 builds occur against the correct Python3 libraries

Modified:
  packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch
  packages/shiboken/trunk/debian/patches/pythonversionindep.patch
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch	2013-06-12 11:29:23 UTC (rev 24758)
+++ packages/shiboken/trunk/debian/patches/python3.3-and-multiarch.patch	2013-06-12 12:59:13 UTC (rev 24759)
@@ -2,15 +2,6 @@
 Forwarded: yes
 --- a/cmake/Modules/FindPython3Libs.cmake
 +++ b/cmake/Modules/FindPython3Libs.cmake
-@@ -27,7 +27,7 @@
- # Search for the python framework on Apple.
- # CMAKE_FIND_FRAMEWORKS(Python)
- 
--FOREACH(_CURRENT_VERSION 3.2 3.1 3.0)
-+FOREACH(_CURRENT_VERSION 3.3 3.2 3.1 3.0)
-   IF(_CURRENT_VERSION GREATER 3.1)
-       SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
-   ELSE()
 @@ -114,11 +114,19 @@
    PYTHON3_INCLUDE_DIR
  )

Modified: packages/shiboken/trunk/debian/patches/pythonversionindep.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/pythonversionindep.patch	2013-06-12 11:29:23 UTC (rev 24758)
+++ packages/shiboken/trunk/debian/patches/pythonversionindep.patch	2013-06-12 12:59:13 UTC (rev 24759)
@@ -1,6 +1,6 @@
-Description: Allow the packaging definitions to pick the desired python version.
+Description: Allow the packaging definitions to pick the desired python version and compilation flags in both Python2 and Python3.
 Author: Didier Raboud <odyx at debian.org>
-Last-Update: 2012-04-20
+Last-Update: 2013-06-12
 --- a/cmake/Modules/FindPythonInterpWithDebug.cmake
 +++ b/cmake/Modules/FindPythonInterpWithDebug.cmake
 @@ -1,4 +1,4 @@
@@ -9,3 +9,40 @@
  
  if (NOT PYTHON_EXECUTABLE)
      find_package(PythonInterp REQUIRED)
+--- a/cmake/Modules/FindPython3Interp.cmake
++++ b/cmake/Modules/FindPython3Interp.cmake
+@@ -19,6 +19,8 @@
+ # (To distributed this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++IF(NOT DEFINED PYTHON3_EXECUTABLE)
++
+ FIND_PROGRAM(PYTHON3_EXECUTABLE
+   NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3
+   PATHS
+@@ -35,6 +37,7 @@
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.0\\InstallPath]
+   )
+ 
++ENDIF()
+ 
+ # handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
+ # all listed variables are TRUE
+--- a/cmake/Modules/FindPython3Libs.cmake
++++ b/cmake/Modules/FindPython3Libs.cmake
+@@ -27,13 +27,13 @@
+ # Search for the python framework on Apple.
+ # CMAKE_FIND_FRAMEWORKS(Python)
+ 
+-FOREACH(_CURRENT_VERSION 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION ${CMAKE_USE_PYTHON_VERSION})
+   IF(_CURRENT_VERSION GREATER 3.1)
+       SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
+   ELSE()
+       SET(_32FLAGS "")
+   ENDIF()
+-  FOREACH(_COMPILATION_FLAGS ${_32FLAGS})
++  FOREACH(_COMPILATION_FLAGS ${CMAKE_USE_PYTHON_COMPILATION_FLAGS})
+       STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+       IF(WIN32)
+         IF(_CURRENT_VERSION GREATER 3.1)

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2013-06-12 11:29:23 UTC (rev 24758)
+++ packages/shiboken/trunk/debian/rules	2013-06-12 12:59:13 UTC (rev 24759)
@@ -58,8 +58,10 @@
 	-DUSE_PYTHON3=ON \
 	-DPYTHON_SUFFIX=-python$*-dbg \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
+	-DCMAKE_USE_PYTHON_COMPILATION_FLAGS="dmu;dm" \
 	-DPython_ADDITIONAL_VERSIONS="$*-dbg;$*_d;$*" \
-	-DPYTHON_EXECUTABLE=/usr/bin/python$*-dbg
+	-DPYTHON3_EXECUTABLE=/usr/bin/python$*m \
+	-DPYTHON3_DBG_EXECUTABLE=/usr/bin/python$*dm
 
 override_dh_auto_configure_3-%:
 	mkdir -p build-$*
@@ -69,9 +71,11 @@
 	-DUSE_PYTHON3=ON \
 	-DPYTHON_SUFFIX=-python$* \
 	-DCMAKE_USE_PYTHON_VERSION=$* \
+	-DCMAKE_USE_PYTHON_COMPILATION_FLAGS="mu;m" \
 	-DPython_ADDITIONAL_VERSIONS=$* \
-	-DPYTHON_EXECUTABLE=/usr/bin/python$* \
-	-DDEFAULT_PYTHON_SUFFIX=-python${DEFAULT_PY}
+	-DPYTHON3_EXECUTABLE=/usr/bin/python$*m \
+	-DPYTHON3_DBG_EXECUTABLE=/usr/bin/python$*dm \
+	-DDEFAULT_PYTHON_SUFFIX=-python${DEFAULT_PY3}
 
 #### BUILD ####