diff options
Diffstat (limited to 'dev-util/cmake/files')
5 files changed, 0 insertions, 231 deletions
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch deleted file mode 100644 index 321f05302aa1..000000000000 --- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/Modules/FindLAPACK.cmake -+++ b/Modules/FindLAPACK.cmake -@@ -4,6 +4,10 @@ - # - # Find LAPACK library - # -+# Version modified for Gentoo Linux. -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# - # This module finds an installed fortran library that implements the - # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). - # -@@ -140,6 +144,23 @@ - - endmacro() - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_LAPACK lapack) -+if(PC_LAPACK_FOUND) -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) -+ mark_as_advanced(LAPACK_LIBRARIES) -+else(PC_LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") - - set(LAPACK_LINKER_FLAGS) - set(LAPACK_LIBRARIES) -@@ -348,3 +369,5 @@ - endif() - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch deleted file mode 100644 index 6bad45b20876..000000000000 --- a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Modules/FindBLAS.cmake -+++ b/Modules/FindBLAS.cmake -@@ -4,6 +4,10 @@ - # - # Find BLAS library - # -+# Version modified for Gentoo Linux. -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# - # This module finds an installed fortran library that implements the - # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The - # list of libraries searched for is taken from the autoconf macro file, -@@ -50,6 +54,9 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# first, try PkgConfig -+set(BLA_PREFER_PKGCONFIG On) -+ - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) - diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch deleted file mode 100644 index bcf229ad398c..000000000000 --- a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/660980 - ---- cmake-3.11.4/Modules/FindBoost.cmake -+++ cmake-3.11.4/Modules/FindBoost.cmake -@@ -1680,7 +1680,7 @@ - list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") - list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") - # Gentoo -- list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") -+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}") - # RPMs - list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}") - endif() diff --git a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch deleted file mode 100644 index bb60aaf35196..000000000000 --- a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch +++ /dev/null @@ -1,127 +0,0 @@ -From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Fri, 9 Jun 2017 01:47:55 +0200 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -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) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Updated by Johannes Huber (cmake-2.8.9) -Updated by Michael Palimaka (cmake-2.8.10) -Updated by Chris Reffett (cmake-2.8.11) -Updated by Michael Palimaka (cmake-3.0.0) -Updated by Lars Wendler (cmake-3.9.0_rc2) ---- - Modules/Platform/Darwin.cmake | 12 ++++++++---- - Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++----- - 2 files changed, 32 insertions(+), 9 deletions(-) - -Index: cmake-3.13.3/Modules/Platform/Darwin.cmake -=================================================================== ---- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake -+++ cmake-3.13.3/Modules/Platform/Darwin.cmake -@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) - --# default to searching for frameworks first -+# default to searching for frameworks last - if(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- set(CMAKE_FIND_FRAMEWORK FIRST) -+ set(CMAKE_FIND_FRAMEWORK LAST) - endif() - - # Older OS X linkers do not report their framework search path -@@ -132,6 +132,8 @@ endif() - - # set up the default search directories for frameworks - set(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - ) - if(_CMAKE_OSX_SYSROOT_PATH) -@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT) - endif() - endif() - --# default to searching for application bundles first -+# default to searching for application bundles last - if(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- set(CMAKE_FIND_APPBUNDLE FIRST) -+ set(CMAKE_FIND_APPBUNDLE LAST) - endif() - # set up the default search directories for application bundles - set(_apps_paths) - foreach(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake -=================================================================== ---- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake -+++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake -@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -- /usr/local /usr / -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ -+ @GENTOO_HOST@/usr/local /usr / - - # CMake install location - "${_CMAKE_INSTALL_DIR}" -@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # X11 -- /usr/include/X11 -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # X11 -- /usr/lib/X11 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ ) -+ -+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include -+ @GENTOO_HOST@/usr/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include -+ @GENTOO_HOST@/usr/include - ) - list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch deleted file mode 100644 index 2808ed79f735..000000000000 --- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch +++ /dev/null @@ -1,25 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - -Forward-ported from 2.8.10 to 3.4.0-rc1 - ---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake -+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake -@@ -26,7 +26,7 @@ - set(CMAKE_SHARED_LIBRARY_PREFIX "lib") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - set(CMAKE_SHARED_MODULE_PREFIX "lib") --set(CMAKE_SHARED_MODULE_SUFFIX ".so") -+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - set(CMAKE_MODULE_EXISTS 1) - set(CMAKE_DL_LIBS "") - -@@ -53,7 +53,7 @@ - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |