From 414877480827f8c1e9e9dac5edbc33c44aeb7b76 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 16 Dec 2010 12:33:20 +0000 Subject: Version bump. Per bug #344259. Thanks to Arseny Solokha for updated patches. (Portage version: 2.2.0_alpha8/cvs/Linux x86_64) --- .../cmake/files/cmake-2.8.3-FindLibArchive.patch | 12 +++ .../cmake/files/cmake-2.8.3-FindPythonInterp.patch | 11 +++ .../cmake/files/cmake-2.8.3-FindPythonLibs.patch | 13 +++ .../files/cmake-2.8.3-more-no_host_paths.patch | 109 +++++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch create mode 100644 dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch create mode 100644 dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch create mode 100644 dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch (limited to 'dev-util/cmake/files') diff --git a/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch b/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch new file mode 100644 index 000000000000..ede3400f012e --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch @@ -0,0 +1,12 @@ +diff -ruN cmake-2.8.3.orig/Modules/FindLibArchive.cmake cmake-2.8.3/Modules/FindLibArchive.cmake +--- cmake-2.8.3.orig/Modules/FindLibArchive.cmake 2010-11-04 02:58:27.000000000 +0700 ++++ cmake-2.8.3/Modules/FindLibArchive.cmake 2010-11-05 17:40:53.712001939 +0700 +@@ -50,7 +50,7 @@ + + # Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND + # to TRUE if all listed variables are TRUE. +-include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") ++include("${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake") + find_package_handle_standard_args(LibArchive DEFAULT_MSG + LibArchive_LIBRARY LibArchive_INCLUDE_DIR + ) diff --git a/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch new file mode 100644 index 000000000000..386457b91427 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch @@ -0,0 +1,11 @@ +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake +@@ -20,7 +20,7 @@ + # License text for the above reference.) + + FIND_PROGRAM(PYTHON_EXECUTABLE +- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python ++ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] diff --git a/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch new file mode 100644 index 000000000000..c4e5adc16486 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch @@ -0,0 +1,13 @@ +--- Modules/FindPythonLibs.cmake ++++ Modules/FindPythonLibs.cmake +@@ -27,7 +27,9 @@ + # Search for the python framework on Apple. + CMAKE_FIND_FRAMEWORKS(Python) + +-FOREACH(_CURRENT_VERSION 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_VERSION) ++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) + STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) + IF(WIN32) + FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch new file mode 100644 index 000000000000..38bad925c373 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch @@ -0,0 +1,109 @@ +Set some proper paths to make cmake find our tools. +Original patch by Heiko Przybyl + +The ebuild now adds an extra / at the end of $EPREFIX so that it is +never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains +correct) + +--- cmake-2.8.3/Modules/Platform/Darwin.cmake ++++ cmake-2.8.3/Modules/Platform/Darwin.cmake +@@ -217,19 +217,23 @@ + + + +-# default to searching for frameworks first +-SET(CMAKE_FIND_FRAMEWORK FIRST) ++# default to searching for frameworks last ++SET(CMAKE_FIND_FRAMEWORK LAST) + # set up the default search directories for frameworks + SET(CMAKE_SYSTEM_FRAMEWORK_PATH ++ @GENTOO_PORTAGE_EPREFIX@Frameworks ++ @GENTOO_PORTAGE_EPREFIX@usr/lib + ~/Library/Frameworks + /Library/Frameworks + /Network/Library/Frameworks + /System/Library/Frameworks) + +-# default to searching for application bundles first +-SET(CMAKE_FIND_APPBUNDLE FIRST) ++# default to searching for application bundles last ++SET(CMAKE_FIND_APPBUNDLE LAST) + # set up the default search directories for application bundles + SET(CMAKE_SYSTEM_APPBUNDLE_PATH ++ @GENTOO_PORTAGE_EPREFIX@Applications ++ @GENTOO_PORTAGE_EPREFIX@usr/bin + ~/Applications + /Applications + /Developer/Applications) +diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake +--- cmake-2.8.3/Modules/Platform/UnixPaths.cmake ++++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake +@@ -33,6 +33,7 @@ + # search types. + LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard ++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ + /usr/local /usr / + + # CMake install location +@@ -44,43 +45,39 @@ + + # List common include file locations not under the common prefixes. + LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include ++ @GENTOO_PORTAGE_EPREFIX@usr/include + ) + + LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + ) + + LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ @GENTOO_PORTAGE_EPREFIX@usr/bin ++ @GENTOO_PORTAGE_EPREFIX@bin + ) + + LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + /lib /usr/lib /usr/lib32 /usr/lib64 + ) + + LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + -- cgit v1.2.3-65-gdbad