diff options
Diffstat (limited to 'dev-util/cmake/files')
4 files changed, 0 insertions, 173 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch deleted file mode 100644 index b00b4f75219b..000000000000 --- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -903,6 +903,11 @@ - - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # Get version of Python. -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) -+ endif() -+ - - # - # Find RELEASE libraries -@@ -913,6 +918,14 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -920,6 +933,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -945,6 +965,15 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -952,6 +981,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) diff --git a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch deleted file mode 100644 index ab27af2ec8ca..000000000000 --- a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: KWSys Robot <kwrobot@kitware.com> -Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400) -Subject: KWSys 2013-10-15 (6eab64c3) -X-Git-Tag: v3.0.0-rc1~178^2^2~5 -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445 - -KWSys 2013-10-15 (6eab64c3) - -Extract upstream KWSys using the following shell commands. - -$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x -$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3 -Raphael Kubo da Costa (1): - 6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD - -Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5 ---- - -diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx -index 7c31f3a..2672730 100644 ---- a/Source/kwsys/SystemInformation.cxx -+++ b/Source/kwsys/SystemInformation.cxx -@@ -88,6 +88,15 @@ typedef int siginfo_t; - # include <ifaddrs.h> - # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN - # endif -+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) -+# include <execinfo.h> -+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) -+# include <cxxabi.h> -+# endif -+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) -+# include <dlfcn.h> -+# endif -+# endif - #endif - - #if defined(__OpenBSD__) || defined(__NetBSD__) diff --git a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch deleted file mode 100644 index f64e40cc51ef..000000000000 --- a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit ab6201ab647c13fee44c44822b8502e9848faaaf -Author: Matt McCormick <matt.mccormick@kitware.com> -Date: Wed Mar 5 17:41:47 2014 -0500 - - FindPython{Interp,Libs}: Search for Python 3.4. - - Python 3.4.0rnc1 was released on 2014-02-20. - -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index 8da848c..e23a58b 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -47,7 +47,7 @@ unset(_Python_NAMES) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) - - if(PythonInterp_FIND_VERSION) - if(PythonInterp_FIND_VERSION_COUNT GREATER 1) -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index 0749efc..1dbc967 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION_COUNT GREATER 1) diff --git a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch deleted file mode 100644 index 5e0efa902679..000000000000 --- a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Wed, 22 Apr 2015 09:58:46 -0400 -Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h - include - -This is needed for 'mode_t', and on mingw-w64 in particular. We added -use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use -permissions of input file if present, 2014-07-22). ---- - Source/cmGeneratorExpressionEvaluationFile.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h -index 4424bec..5d8b54c 100644 ---- a/Source/cmGeneratorExpressionEvaluationFile.h -+++ b/Source/cmGeneratorExpressionEvaluationFile.h -@@ -13,6 +13,7 @@ - #define cmGeneratorExpressionEvaluationFile_h - - #include "cmStandardIncludes.h" -+#include <sys/types.h> - #include <cmsys/auto_ptr.hxx> - - #include "cmGeneratorExpression.h" --- -1.7.10.4 - |