[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.4-FindPythonLibs.patch cmake-2.8.4-FindBoost.patch cmake-2.8.4-FindPythonInterp.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/02/21 14:52:57

  Added:                cmake-2.8.4-FindPythonLibs.patch
                        cmake-2.8.4-FindBoost.patch
                        cmake-2.8.4-FindPythonInterp.patch
  Log:
  Version bump to the latest (some tests still fail, to be fixed).
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.4-FindPythonLibs.patch
===================================================================
diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
--- cmake-2.8.4.old/Modules/FindPythonLibs.cmake	2011-02-20 19:32:16.363655002 +0100
+++ cmake-2.8.4/Modules/FindPythonLibs.cmake	2011-02-20 19:33:51.905655001 +0100
@@ -33,6 +33,8 @@
   ${Python_ADDITIONAL_VERSIONS}
   2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
 
+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
+	OUTPUT_VARIABLE _Python_VERSIONS)
 FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
   IF(WIN32)



1.1                  dev-util/cmake/files/cmake-2.8.4-FindBoost.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.4-FindBoost.patch
===================================================================
diff -urN cmake-2.8.4.old//Modules/FindBoost.cmake cmake-2.8.4/Modules/FindBoost.cmake
--- cmake-2.8.4.old//Modules/FindBoost.cmake	2011-02-20 19:32:16.528655001 +0100
+++ cmake-2.8.4/Modules/FindBoost.cmake	2011-02-20 20:28:41.572936744 +0100
@@ -73,6 +73,9 @@
 # binary Boost releases do so.
 #
 # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
+set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48"
+    "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0"
+    "1.43" "1.42.0" "1.42")
 #
 # ===================================== ============= ========================
 #



1.1                  dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.4-FindPythonInterp.patch
===================================================================
diff -urN cmake-2.8.4.old/Modules/FindPythonInterp.cmake cmake-2.8.4/Modules/FindPythonInterp.cmake
--- cmake-2.8.4.old/Modules/FindPythonInterp.cmake	2011-02-20 19:32:16.545655003 +0100
+++ cmake-2.8.4/Modules/FindPythonInterp.cmake	2011-02-20 20:22:37.597936743 +0100
@@ -26,6 +26,7 @@
   ${Python_ADDITIONAL_VERSIONS}
   2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
 
+set(_Python_VERSIONS "")
 # Run first with the Python version in the executable
 foreach(_CURRENT_VERSION ${_Python_VERSIONS})
   set(_Python_NAMES python${_CURRENT_VERSION})