diff options
author | Johannes Huber <johu@gentoo.org> | 2012-07-08 23:35:54 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-07-08 23:35:54 +0000 |
commit | 47e47d4e98193c635e0926ec07bfb1b0724e3afe (patch) | |
tree | 9e42e593fe909b1d89af0e35d0358a6bc02c6bd9 /dev-util/cmake/files | |
parent | marked x86 per bug 425194 (diff) | |
download | historical-47e47d4e98193c635e0926ec07bfb1b0724e3afe.tar.gz historical-47e47d4e98193c635e0926ec07bfb1b0724e3afe.tar.bz2 historical-47e47d4e98193c635e0926ec07bfb1b0724e3afe.zip |
Remove old.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch | 12 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch | 34 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch | 35 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch | 34 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 |
5 files changed, 0 insertions, 145 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch deleted file mode 100644 index 45d2b162c5b7..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake ---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100 -+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100 -@@ -180,7 +180,7 @@ - - - # Determine the list of possible names for the ruby library --SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT}) -+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT}) - - IF(WIN32) - SET( _RUBY_MSVC_RUNTIME "" ) diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch deleted file mode 100644 index 8a8fe6f392a8..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001 -From: Clinton Stimpson <clinton@elemtech.com> -Date: Wed, 5 Oct 2011 10:02:32 -0600 -Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project. - ---- - Source/cmExtraCodeBlocksGenerator.cxx | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx -index 7db91c7..9a0b1ea 100644 ---- a/Source/cmExtraCodeBlocksGenerator.cxx -+++ b/Source/cmExtraCodeBlocksGenerator.cxx -@@ -19,6 +19,7 @@ - #include "cmGeneratedFileStream.h" - #include "cmTarget.h" - #include "cmSystemTools.h" -+#include "cmXMLSafe.h" - - #include <cmsys/SystemTools.hxx> - -@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, - for(std::vector<std::string>::const_iterator di = defs.begin(); - di != defs.end(); ++di) - { -- fout <<" <Add option=\"-D" << di->c_str() << "\" />\n"; -+ cmXMLSafe safedef(di->c_str()); -+ fout <<" <Add option=\"-D" << safedef.str() << "\" />\n"; - } - } - --- -1.7.0 - diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch deleted file mode 100644 index 16b6480f577b..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake ---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200 -+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -39,6 +45,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(BLAS blas) -+if(NOT BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(CheckFunctionExists) - include(CheckFortranFunctionExists) - -@@ -622,3 +636,6 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT BLAS_FOUND) -+ diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch deleted file mode 100644 index 579a07d880a1..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800 -+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find LAPACK library - # This module finds an installed fortran library that implements the LAPACK - # linear-algebra interface (see http://www.netlib.org/lapack/). -@@ -36,6 +42,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(LAPACK lapack) -+if(NOT LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") -+ - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) -@@ -304,4 +318,6 @@ - endif(NOT LAPACK_FIND_QUIETLY) - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch deleted file mode 100644 index 77467676c841..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in -index 97b2a07..edafb4ef 100644 ---- a/Tests/CTestUpdateSVN.cmake.in -+++ b/Tests/CTestUpdateSVN.cmake.in -@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config) - set(SVNCMD ${SVN} --config-dir ${TOP}/config) - set(SVNUSER --username "test author" --non-interactive) - -+# Configure for this svn version. -+execute_process( -+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add -+ ) -+if("${help_add}" MATCHES "--depth") -+ set(depth_empty "--depth=empty") -+else() -+ set(depth_empty "") -+endif() -+ - #----------------------------------------------------------------------------- - # Initialize the testing directory. - message("Creating test directory...") -@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added) - if(dirs_added) - run_child( - WORKING_DIRECTORY ${TOP}/user-source -- COMMAND ${SVNCMD} add ${dirs_added} -+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} - ) - endif(dirs_added) - run_child( |