diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-08 11:33:39 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-08 11:33:39 +0000 |
commit | 376f54c88f146b4a07a651e1fdde175980180515 (patch) | |
tree | b7bd053d3e705a3f2bd0ef02d2df0adda8a3470a /dev-util/cmake/files | |
parent | Revision bump to fix pkgconfig file as noted by Alexis Ballier in bug #235013. (diff) | |
download | historical-376f54c88f146b4a07a651e1fdde175980180515.tar.gz historical-376f54c88f146b4a07a651e1fdde175980180515.tar.bz2 historical-376f54c88f146b4a07a651e1fdde175980180515.zip |
Drop older stuff. Keep just latest stable.
Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r-- | dev-util/cmake/files/cmake-2.6.0-interix.patch | 48 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.6.4-FindBoost.patch | 22 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch | 74 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-FindBoost.patch | 14 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch | 108 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-mpi.patch | 20 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch | 12 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch | 11 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch | 13 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch | 12 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindJNI.patch | 71 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 11 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 13 |
13 files changed, 0 insertions, 429 deletions
diff --git a/dev-util/cmake/files/cmake-2.6.0-interix.patch b/dev-util/cmake/files/cmake-2.6.0-interix.patch deleted file mode 100644 index 0f0f1db0a90e..000000000000 --- a/dev-util/cmake/files/cmake-2.6.0-interix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN cmake-2.6.0.orig/Modules/Platform/Interix.cmake cmake-2.6.0/Modules/Platform/Interix.cmake ---- cmake-2.6.0.orig/Modules/Platform/Interix.cmake 1970-01-01 01:00:00 +0100 -+++ cmake-2.6.0/Modules/Platform/Interix.cmake 2008-06-02 14:22:45 +0200 -@@ -0,0 +1,31 @@ -+# This is a proposed Platform definition for Interix GCC/G++ -+ -+SET(CMAKE_DL_LIBS "dl") -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") -+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h,") -+ -+SET(UNIX 1) -+ -+# also add the install directory of the running cmake to the search directories -+# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up -+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) -+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) -+ -+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ "${_CMAKE_INSTALL_DIR}" -+ "${CMAKE_INSTALL_PREFIX}" -+ ) -+ -+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -+ "${CMAKE_INSTALL_PREFIX}"/include -+ ) -+ -+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -+ "${CMAKE_INSTALL_PREFIX}"/lib -+ ) -+ -diff -ruN cmake-2.6.0.orig/Utilities/cmtar/encode.c cmake-2.6.0/Utilities/cmtar/encode.c ---- cmake-2.6.0.orig/Utilities/cmtar/encode.c 2008-06-02 13:00:44 +0200 -+++ cmake-2.6.0/Utilities/cmtar/encode.c 2008-06-02 14:02:39 +0200 -@@ -24,6 +24,9 @@ - # include <stdlib.h> - #endif - -+#ifdef HAVE_SYS_MKDEV_H -+# include <sys/mkdev.h> -+#endif - - /* magic, version, and checksum */ - void diff --git a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch deleted file mode 100644 index a251d4fd1c1a..000000000000 --- a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -57,7 +57,8 @@ - # - # Currently this module searches for the following version numbers: - # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, --# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0 -+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0, -+# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0 - # - # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should - # add both 1.x and 1.x.0 as shown above. Official Boost include directories -@@ -271,7 +272,8 @@ - # The user has not requested an exact version. Among known - # versions, find those that are acceptable to the user request. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.38.0" "1.38" "1.37.0" "1.37" -+ "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41" -+ "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" - "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" - "1.34" "1.33.1" "1.33.0" "1.33") - set(_boost_TEST_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch deleted file mode 100644 index 8149917d0a49..000000000000 --- a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Don't build the GUI's app-bundle. -Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> ---- cmake-2.8.0/CMakeLists.txt.orig 2010-02-10 19:38:03 +0100 -+++ cmake-2.8.0/CMakeLists.txt 2010-02-10 19:38:49 +0100 -@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog) - ENDIF(BUILD_CursesDialog) - - IF(BUILD_QtDialog) -- IF(APPLE) -+ IF(FALSE) - SET(CMAKE_BUNDLE_NAME - "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") - SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") -@@ -394,7 +394,7 @@ IF(BUILD_QtDialog) - ENDIF(NOT "${ENDCH}" STREQUAL "/") - SET(CMAKE_INSTALL_PREFIX - "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents") -- ENDIF(APPLE) -+ ENDIF(FALSE) - - SET(QT_NEED_RPATH FALSE) - IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") ---- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig 2010-02-10 19:39:59 +0100 -+++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt 2010-02-10 19:42:12 +0100 -@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND) - IF(Q_WS_WIN) - SET(SRCS ${SRCS} CMakeSetup.rc) - ENDIF(Q_WS_WIN) -- IF(Q_WS_MAC) -+ IF(FALSE) - SET(SRCS ${SRCS} CMakeSetup.icns) - SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) - SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES - MACOSX_PACKAGE_LOCATION Resources) -- ENDIF(Q_WS_MAC) -+ ENDIF(FALSE) - - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - -- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) -+ ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS}) - TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) - IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) -- IF(APPLE) -+ IF(FALSE) - SET_TARGET_PROPERTIES(cmake-gui PROPERTIES - OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) -- ENDIF(APPLE) -+ ENDIF(FALSE) - SET(CMAKE_INSTALL_DESTINATION_ARGS - BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") - ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) -@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND) - INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages ) - ENDIF(UNIX) - -- IF(APPLE) -+ IF(FALSE) - SET(CMAKE_POSTFLIGHT_SCRIPT - "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") - SET(CMAKE_POSTUPGRADE_SCRIPT -@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND) - INSTALL(CODE "set(input_file - \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")") - INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake") -- ENDIF(APPLE) -+ ENDIF(FALSE) - CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in" - "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY) - ENDIF(NOT QT4_FOUND)
\ No newline at end of file diff --git a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch deleted file mode 100644 index 56fb152d663a..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake ---- cmake-2.8.1.orig/Modules/FindBoost.cmake 2010-03-16 21:29:29.000000000 +0100 -+++ cmake-2.8.1/Modules/FindBoost.cmake 2010-04-04 19:52:50.000000000 +0200 -@@ -70,7 +70,9 @@ - # omit the 3rd version number from include paths if it is 0 although not all - # 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") - # - # ===================================== ============= ======================== - # diff --git a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch deleted file mode 100644 index 0558b34e6efd..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch +++ /dev/null @@ -1,108 +0,0 @@ -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.0/Modules/Platform/Darwin.cmake -+++ cmake-2.8.0/Modules/Platform/Darwin.cmake -@@ -213,19 +213,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) ---- cmake-2.8.0/Modules/Platform/UnixPaths.cmake -+++ cmake-2.8.0/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 -- /opt/local/include /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 -- /opt/local/lib /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 - ) - diff --git a/dev-util/cmake/files/cmake-2.8.1-mpi.patch b/dev-util/cmake/files/cmake-2.8.1-mpi.patch deleted file mode 100644 index 67f1001464dc..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-mpi.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake -index 481b0e9..43e97e8 100644 ---- a/Modules/FindMPI.cmake -+++ b/Modules/FindMPI.cmake -@@ -263,13 +263,13 @@ elseif (MPI_COMPILE_CMDLINE) - - # Extract the set of libraries to link against from the link command - # line -- string(REGEX MATCHALL "-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") -+ string(REGEX MATCHALL " -l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") - - # Determine full path names for all of the libraries that one needs - # to link against in an MPI program - set(MPI_LIBRARIES) - foreach(LIB ${MPI_LIBNAMES}) -- string(REGEX REPLACE "^-l" "" LIB ${LIB}) -+ string(REGEX REPLACE "^ -l" "" LIB ${LIB}) - set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) - find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH}) - if (MPI_LIB) diff --git a/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch b/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch deleted file mode 100644 index ede3400f012e..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 386457b91427..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index c4e5adc16486..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-buffer_overflow.patch b/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch deleted file mode 100644 index 6bc5a6641a09..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx cmake-2.8.3//Source/kwsys/SystemInformation.cxx ---- cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx 2010-12-25 16:56:42.609163498 +0100 -+++ cmake-2.8.3//Source/kwsys/SystemInformation.cxx 2010-12-25 17:25:18.002163499 +0100 -@@ -152,7 +152,7 @@ - - public: - #define VENDOR_STRING_LENGTH (12 + 1) --#define CHIPNAME_STRING_LENGTH (48 + 1) -+#define CHIPNAME_STRING_LENGTH (68 + 1) - #define SERIALNUMBER_STRING_LENGTH (29 + 1) - - typedef struct tagID diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch deleted file mode 100644 index af723c52919f..000000000000 --- a/dev-util/cmake/files/cmake-FindJNI.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake ---- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100 -+++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100 -@@ -2,7 +2,7 @@ - # This module finds if Java is installed and determines where the - # include files and libraries are. It also determines what the name of - # the library is. This code sets the following variables: --# -+# - # JNI_INCLUDE_DIRS = the include dirs to use - # JNI_LIBRARIES = the libraries to use - # JAVA_AWT_LIBRARY = the path to the jawt library -@@ -51,6 +51,8 @@ - "${dir}" - "${dir}/client" - "${dir}/server" -+ "${dir}/j9vm" -+ "${dir}/classic" - ) - ENDFOREACH(dir) - -@@ -60,7 +62,7 @@ - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" - $ENV{JAVA_HOME}/include -- /usr/include -+ /usr/include - /usr/local/include - /usr/lib/java/include - /usr/local/lib/java/include -@@ -126,7 +128,7 @@ - ) - ENDIF(JAVA_HAVE_FRAMEWORK) - ELSE(APPLE) -- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt -+ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt - PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} - ) - FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM -@@ -134,18 +136,23 @@ - ) - ENDIF(APPLE) - --# add in the include path --FIND_PATH(JAVA_INCLUDE_PATH jni.h -+# add in the include path -+FIND_PATH(JAVA_INCLUDE_PATH jni.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ) - --FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h -+FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH}/win32 - ${JAVA_INCLUDE_PATH}/linux - ${JAVA_INCLUDE_PATH}/freebsd - ) - -+FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h -+ ${JAVA_AWT_INCLUDE_DIRECTORIES} -+ ${JAVA_INCLUDE_PATH} -+) -+ - FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH} -@@ -169,4 +176,3 @@ - ${JAVA_INCLUDE_PATH2} - ${JAVA_AWT_INCLUDE_PATH} - ) -- diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch deleted file mode 100644 index 2e4c47d6806f..000000000000 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -7,7 +7,7 @@ - # - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES 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.5\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch deleted file mode 100644 index d7f4f627be4c..000000000000 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -14,7 +14,9 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 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 |