From 33736ea90a3c7fb5dd44157316462d7a3b0bad95 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 13 Oct 2013 20:23:51 +0200 Subject: [dev-util/cmake] Version bump wrt bug #487604. Package-Manager: portage-2.2.7 --- dev-util/cmake/Manifest | 1 + dev-util/cmake/cmake-2.8.12.ebuild | 197 +++++++++++++++++++++ dev-util/cmake/files/50cmake-gentoo.el | 4 + .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++ .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++ .../cmake-2.8.0-darwin-default-install_name.patch | 20 +++ .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++ .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++ dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++ dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++ .../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++ .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++ .../files/cmake-2.8.11-FindBoost-python.patch | 73 ++++++++ .../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++ .../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++ dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++ .../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++ dev-util/cmake/files/cmake.vim | 3 + dev-util/cmake/metadata.xml | 5 + 20 files changed, 818 insertions(+) create mode 100644 dev-util/cmake/Manifest create mode 100644 dev-util/cmake/cmake-2.8.12.ebuild create mode 100644 dev-util/cmake/files/50cmake-gentoo.el create mode 100644 dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch create mode 100644 dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch create mode 100644 dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10-desktop.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10-libform.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch create mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch create mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch create mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch create mode 100644 dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch create mode 100644 dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch create mode 100644 dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch create mode 100644 dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch create mode 100644 dev-util/cmake/files/cmake.vim create mode 100644 dev-util/cmake/metadata.xml (limited to 'dev-util') diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest new file mode 100644 index 00000000000..07d44e781cc --- /dev/null +++ b/dev-util/cmake/Manifest @@ -0,0 +1 @@ +DIST cmake-2.8.12.tar.gz 6064138 SHA256 d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287 SHA512 39d771fb4730693b19c567b7646f41ffa3d45f488a410b9e3724f42cca1139ce091fd7b8f26c09480d0100ceb49d23177bc01cd3665fdcfb53f29bf76a2dbd13 WHIRLPOOL 42d0c1dc825ba25bc73fb9068011fa71ea088922c96d12e471cae1a25c7f89825962b698373d4d96a03b29c4683e1d5ef3306ab4c1150c14db560d165e4a92f8 diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild new file mode 100644 index 00000000000..24231c9bd78 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.12.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.1 2013/09/11 18:00:59 kensington Exp $ + +EAPI=5 + +CMAKE_REMOVE_MODULES="no" +inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Cross platform Make" +HOMEPAGE="http://www.cmake.org/" +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="emacs ncurses qt4 qt5 vim-syntax" + +REQUIRED_USE="?? ( qt4 qt5 )" + +DEPEND=" + >=app-arch/libarchive-2.8.0:= + >=dev-libs/expat-2.0.1 + >=net-misc/curl-7.20.0-r1[ssl] + sys-libs/zlib + virtual/pkgconfig + ncurses? ( sys-libs/ncurses ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} + emacs? ( virtual/emacs ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" +VIMFILE="${PN}.vim" + +CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch + "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch + "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch + "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch + "${FILESDIR}"/${PN}-2.8.10-desktop.patch + "${FILESDIR}"/${PN}-2.8.10-libform.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch + "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch + "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch +) + +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') + par_arg="--parallel=${par_arg}" + else + par_arg="--parallel=1" + fi + + tc-export CC CXX LD + + # bootstrap script isn't exactly /bin/sh compatible + ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + ${par_arg} \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:#IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${CMAKE_BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # CTest.updatecvs, which fails to commit as root + # Qt4Deploy, which tries to break sandbox and ignores prefix + # TestUpload, which requires network access + "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ + -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ + || die "Tests failed" + + popd > /dev/null +} + +pkg_setup() { + # bug 387227 + addpredict /proc/self/coredump_filter +} + +src_prepare() { + cmake-utils_src_prepare + + # disable running of cmake in boostrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + cmake_src_bootstrap +} + +src_configure() { + # make things work with gentoo java setup + # in case java-config cannot be run, the variable just becomes unset + # per bug #315229 + export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + $(cmake-utils_use_build ncurses CursesDialog) + ) + + if use qt4 || use qt5 ; then + mycmakeargs+=( + -DBUILD_QtDialog=ON + $(cmake-utils_use_find_package qt5 Qt5Widgets) + ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use emacs && elisp-compile Docs/cmake-mode.el +} + +src_test() { + VIRTUALX_COMMAND="cmake_src_test" virtualmake +} + +src_install() { + cmake-utils_src_install + if use emacs; then + elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins Docs/cmake-syntax.vim + + insinto /usr/share/vim/vimfiles/indent + doins Docs/cmake-indent.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${VIMFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el new file mode 100644 index 00000000000..e4a1a6d47cb --- /dev/null +++ b/dev-util/cmake/files/50cmake-gentoo.el @@ -0,0 +1,4 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) +(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) +(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch new file mode 100644 index 00000000000..02c3011c8f7 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch @@ -0,0 +1,39 @@ +http://public.kitware.com/Bug/view.php?id=7933 + +diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx +--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 ++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 +@@ -38,6 +38,13 @@ + int main() { return 0; } + #endif + ++#ifdef TEST_KWSYS_LFS_SUPPORT ++#define _LARGE_FILES ++#include ++int main() { return 0; } ++#endif ++ ++ + #ifdef TEST_KWSYS_IOS_HAVE_STD + #include + void f(std ::ostream*) {} +diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap +--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 ++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 +@@ -1005,6 +1005,16 @@ + echo "${cmake_cxx_compiler} does not have stl iterator_traits" + fi + ++if cmake_try_run "${cmake_cxx_compiler}" \ ++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ ++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then ++ KWSYS_LFS_AVAILABLE=1 ++ echo "LFS support available" ++else ++ KWSYS_LFS_AVAILABLE=0 ++ echo "LFS support unavailable, disabled" ++fi ++ + if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch new file mode 100644 index 00000000000..ceb205ff586 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch @@ -0,0 +1,19 @@ +Patch by Heiko Przybyl + +--- Source/cmComputeLinkInformation.cxx ++++ Source/cmComputeLinkInformation.cxx +@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge + for(std::vector::const_iterator ri = runtimeDirs.begin(); + ri != runtimeDirs.end(); ++ri) + { ++ // Do not add duplicates. ++ // I'd like to have that check already in the list generation code ++ // but that would need lots of more changes, even in ExpandListArgument(). ++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) ++ { ++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; ++ continue; ++ } + // Separate from previous path. + rpath += sep; + sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch new file mode 100644 index 00000000000..4ef0c7b4b6f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch @@ -0,0 +1,20 @@ +The install_name of a library can be compared to the ELF soname, setting +it to just the library name (libx.1.dylib) is not sufficient on Mach-O, +as it uses full paths. Most apps have no clue about that, so they don't +do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html + +Provide a sane default that will allow merging most cmake-based +packages. If this location is not correct, Portage's QA checks will +catch that. + +--- Source/cmTarget.cxx ++++ Source/cmTarget.cxx +@@ -974,7 +974,7 @@ + this->Makefile->IsOn("MINGW")); + + // Setup default property values. +- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); ++ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); + this->SetPropertyDefault("INSTALL_RPATH", ""); + this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); + this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch new file mode 100644 index 00000000000..9cb4777cc9b --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch @@ -0,0 +1,23 @@ +Don't use .so for modules on darwin/macos. Use .bundle instead. +Patch by Heiko Przybyl + +--- Modules/Platform/Darwin.cmake ++++ 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 "") + +@@ -48,7 +48,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 ".dylib" ".so" ".a") ++set(CMAKE_FIND_LIBRARY_SUFFIXES ".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 diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch new file mode 100644 index 00000000000..97c93aa5831 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch @@ -0,0 +1,50 @@ +Do not detect Xcode and set -isysroot for its SDK, since that messes up +our toolchain, and hence makes any compilation fail, bug #445308 + +--- Modules/Platform/Darwin.cmake ++++ Modules/Platform/Darwin.cmake +@@ -60,18 +60,18 @@ + endif() + + # Ask xcode-select where to find /Developer or fall back to ancient location. +-execute_process(COMMAND xcode-select -print-path +- OUTPUT_VARIABLE _stdout +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_VARIABLE _stderr +- RESULT_VARIABLE _failed) +-if(NOT _failed AND IS_DIRECTORY ${_stdout}) +- set(OSX_DEVELOPER_ROOT ${_stdout}) +-elseif(IS_DIRECTORY "/Developer") +- set(OSX_DEVELOPER_ROOT "/Developer") +-else() ++#execute_process(COMMAND xcode-select -print-path ++# OUTPUT_VARIABLE _stdout ++# OUTPUT_STRIP_TRAILING_WHITESPACE ++# ERROR_VARIABLE _stderr ++# RESULT_VARIABLE _failed) ++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) ++# set(OSX_DEVELOPER_ROOT ${_stdout}) ++#elseif(IS_DIRECTORY "/Developer") ++# set(OSX_DEVELOPER_ROOT "/Developer") ++#else() + set(OSX_DEVELOPER_ROOT "") +-endif() ++#endif() + + execute_process(COMMAND sw_vers -productVersion + OUTPUT_VARIABLE CURRENT_OSX_VERSION +@@ -91,10 +91,10 @@ + # CMAKE_OSX_DEPLOYMENT_TARGET + + # Set cache variable - end user may change this during ccmake or cmake-gui configure. +-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) +- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING +- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") +-endif() ++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) ++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING ++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") ++#endif() + + #---------------------------------------------------------------------------- + # CMAKE_OSX_SYSROOT diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch new file mode 100644 index 00000000000..e0cefa9ceaf --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch @@ -0,0 +1,13 @@ +diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop +index 645eb76..7be495f 100644 +--- a/Source/QtDialog/CMake.desktop ++++ b/Source/QtDialog/CMake.desktop +@@ -3,7 +3,7 @@ Version=1.0 + Name=CMake + Comment=Cross-platform buildsystem + Exec=cmake-gui %f +-Icon=CMakeSetup32.png ++Icon=CMakeSetup32 + Terminal=false + X-MultipleArgs=false + Type=Application diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch new file mode 100644 index 00000000000..052cc30699f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea1c033..ae479ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) + else () + set(BUILD_CursesDialog 0) + endif () +- if(BUILD_CursesDialog) +- add_subdirectory(Source/CursesDialog/form) +- endif() + endmacro () + + #----------------------------------------------------------------------- +diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt +index 96e28b4..4102379 100644 +--- a/Source/CursesDialog/CMakeLists.txt ++++ b/Source/CursesDialog/CMakeLists.txt +@@ -25,13 +25,16 @@ set( CURSES_SRCS + CursesDialog/ccmake + ) + +-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + include_directories(${CURSES_INCLUDE_PATH}) + + + add_executable(ccmake ${CURSES_SRCS} ) + target_link_libraries(ccmake CMakeLib) +-target_link_libraries(ccmake cmForm) ++TARGET_LINK_LIBRARIES(ccmake form) ++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) ++IF(CURSES_EXTRA_LIBRARY) ++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) ++ENDIF(CURSES_EXTRA_LIBRARY) ++ + + install_targets(/bin ccmake) +diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h +index b157a28..f131ea4 100644 +--- a/Source/CursesDialog/cmCursesStandardIncludes.h ++++ b/Source/CursesDialog/cmCursesStandardIncludes.h +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif + +-#include +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch new file mode 100644 index 00000000000..a7e8688ec87 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch @@ -0,0 +1,22 @@ +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake +@@ -60,6 +60,10 @@ + + list(APPEND _Python_NAMES python) + ++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ set(_Python_NAMES python) ++endif() ++ + # Search for the current active python version first + find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) + +@@ -76,7 +80,7 @@ + unset(_PYTHON3_VERSIONS) + + # Search for newest python version if python executable isn't found +-if(NOT PYTHON_EXECUTABLE) ++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) + foreach(_CURRENT_VERSION ${_Python_VERSIONS}) + set(_Python_NAMES python${_CURRENT_VERSION}) + if(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch new file mode 100644 index 00000000000..2a83ff7abb6 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch @@ -0,0 +1,24 @@ +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index bffa9fb..8fc90ee 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -74,6 +74,19 @@ set(_Python_VERSIONS + ${_PYTHON_FIND_OTHER_VERSIONS} + ) + ++# Gentoo portage requires that you use exactly the given python version ++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" ++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) ++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) ++ if (_Gentoo_Python_INDEX EQUAL -1) ++ # the current Gentoo python version is not compatible with what is requested ++ set(_Python_VERSIONS) ++ else () ++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") ++ endif () ++endif() ++ + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS) + unset(_PYTHON2_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch new file mode 100644 index 00000000000..02e44fb240b --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch @@ -0,0 +1,48 @@ +--- b/Modules/FindBLAS.cmake ++++ a/Modules/FindBLAS.cmake +@@ -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/). +@@ -40,6 +46,26 @@ + # (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(PC_BLAS blas) ++if(PC_BLAS_FOUND) ++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) ++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_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_BLAS_LIBRARY_DIRS}") ++ endif (NOT ${PC_LIB}_LIBRARY) ++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) ++ endforeach(PC_LIB) ++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) ++ mark_as_advanced(BLAS_LIBRARIES) ++else(PC_BLAS_FOUND) ++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") ++ ++ ++ + include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) + +@@ -604,3 +630,8 @@ + endif() + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) ++ ++ ++endif(PC_BLAS_FOUND) ++ ++ 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 new file mode 100644 index 00000000000..b00b4f75219 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch @@ -0,0 +1,73 @@ +--- 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.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch new file mode 100644 index 00000000000..f5b70c1f47f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/show_bug.cgi?id=465898 + +--- Modules/FindImageMagick.cmake ++++ Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +@@ -147,17 +147,17 @@ + ) + if(component STREQUAL "Magick++") + FIND_IMAGEMAGICK_API(Magick++ Magick++.h +- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 ++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + elseif(component STREQUAL "MagickWand") + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h +- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 ++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + elseif(component STREQUAL "MagickCore") + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h +- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 ++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) + else() diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch new file mode 100644 index 00000000000..36f4dede1f5 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch @@ -0,0 +1,130 @@ +From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 +From: Michael Palimaka +Date: Tue, 6 Nov 2012 23:35:34 +1100 +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) + +--- a/Modules/Platform/Darwin.cmake ++++ b/Modules/Platform/Darwin.cmake +@@ -252,9 +252,9 @@ + " -o ") + + +-# 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 +@@ -276,6 +276,8 @@ + + # 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 +@@ -298,13 +300,15 @@ + 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+ +--- a/Modules/Platform/UnixPaths.cmake ++++ b/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,41 @@ + + # 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/libx32 ++ @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 +- /lib /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 ++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 + ) + + 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.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch new file mode 100644 index 00000000000..6808b80ae50 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch @@ -0,0 +1,44 @@ +diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake +--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 ++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 +@@ -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,24 @@ + # (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(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_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + + get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) +@@ -305,3 +329,5 @@ + endif(BLA_F95) + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) ++ ++endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch new file mode 100644 index 00000000000..c5e17c5ba64 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch @@ -0,0 +1,18 @@ +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index c47f583..5783d37 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -87,7 +87,12 @@ + set(PKG_CONFIG_VERSION 1) + set(PKG_CONFIG_FOUND 0) + +-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++if(NOT PKG_CONFIG_EXECUTABLE) ++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) ++ if(NOT PKG_CONFIG_EXECUTABLE) ++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++ endif(NOT PKG_CONFIG_EXECUTABLE) ++endif(NOT PKG_CONFIG_EXECUTABLE) + mark_as_advanced(PKG_CONFIG_EXECUTABLE) + + if(PKG_CONFIG_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim new file mode 100644 index 00000000000..5cecd7d05b6 --- /dev/null +++ b/dev-util/cmake/files/cmake.vim @@ -0,0 +1,3 @@ +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake +autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml new file mode 100644 index 00000000000..a23f444b67d --- /dev/null +++ b/dev-util/cmake/metadata.xml @@ -0,0 +1,5 @@ + + + + kde + -- cgit v1.2.3 From 7994b7db29991e02e45ee188d686495afe8c9ee1 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 13 Oct 2013 20:47:13 +0200 Subject: [dev-util/krazy2] Move to git-r3 eclass. Package-Manager: portage-2.2.7 --- dev-util/krazy2/krazy2-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev-util') diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild index aa119737531..e347b18738f 100644 --- a/dev-util/krazy2/krazy2-9999.ebuild +++ b/dev-util/krazy2/krazy2-9999.ebuild @@ -4,11 +4,11 @@ EAPI=5 -inherit perl-module qt4-r2 cmake-utils multilib git-2 +inherit perl-module qt4-r2 cmake-utils multilib git-r3 DESCRIPTION="Source code sanity checker for KDE developers." HOMEPAGE="http://www.kde.org/" -EGIT_REPO_URI="git://gitorious.org/krazy/krazy.git" +EGIT_REPO_URI=( "git://gitorious.org/krazy/krazy.git" ) LICENSE="GPL-2" KEYWORDS="" -- cgit v1.2.3 From 21f6a148baecc950c5e5ddc3dc43db5a5d067fe1 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Sun, 13 Oct 2013 20:48:58 +0200 Subject: [dev-util/cpp-dependency-analyzer] Move to git-r3 eclass. Package-Manager: portage-2.2.7 --- dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev-util') diff --git a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild index f9fdf4c8bf0..80fbb273625 100644 --- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild +++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild @@ -4,11 +4,11 @@ EAPI=5 -inherit git-2 cmake-utils +inherit git-r3 cmake-utils DESCRIPTION="Tool that creates dependency graph of C++ code" HOMEPAGE="http://gitorious.org/cpp-dependency-analyzer/" -EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}" +EGIT_REPO_URI=( "git://gitorious.org/${PN}/${PN}" ) LICENSE="LGPL-3" KEYWORDS="" -- cgit v1.2.3 From cee0fda61028298418a2cbdcbc013b1b9e5cc23f Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 17 Oct 2013 21:16:13 +0200 Subject: [dev-util/cmake] Use non deprecated BUILD_DIR var. Package-Manager: portage-2.2.7 --- dev-util/cmake/cmake-2.8.12.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev-util') diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild index 24231c9bd78..bfd1f2c6a3c 100644 --- a/dev-util/cmake/cmake-2.8.12.ebuild +++ b/dev-util/cmake/cmake-2.8.12.ebuild @@ -98,7 +98,7 @@ cmake_src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die - pushd "${CMAKE_BUILD_DIR}" > /dev/null + pushd "${BUILD_DIR}" > /dev/null local ctestargs [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" @@ -108,7 +108,7 @@ cmake_src_test() { # CTest.updatecvs, which fails to commit as root # Qt4Deploy, which tries to break sandbox and ignores prefix # TestUpload, which requires network access - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ + "${BUILD_DIR}"/bin/ctest ${ctestargs} \ -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ || die "Tests failed" -- cgit v1.2.3 From 324d199fb840c0900ccf4d666bdd2a59bdeef3f9 Mon Sep 17 00:00:00 2001 From: Chris Reffett Date: Sun, 20 Oct 2013 23:26:23 -0400 Subject: [dev-util/cmake] Moved to tree --- dev-util/cmake/Manifest | 1 - dev-util/cmake/cmake-2.8.12.ebuild | 197 --------------------- dev-util/cmake/files/50cmake-gentoo.el | 4 - .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ---- .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 -- .../cmake-2.8.0-darwin-default-install_name.patch | 20 --- .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 --- .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------ dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 -- dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------ .../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 --- .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 --- dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 ----- .../files/cmake-2.8.11-FindBoost-python.patch | 73 -------- .../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ---- .../files/cmake-2.8.11-more-no_host_paths.patch | 130 -------------- dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 ----- .../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 -- dev-util/cmake/files/cmake.vim | 3 - dev-util/cmake/metadata.xml | 5 - 20 files changed, 818 deletions(-) delete mode 100644 dev-util/cmake/Manifest delete mode 100644 dev-util/cmake/cmake-2.8.12.ebuild delete mode 100644 dev-util/cmake/files/50cmake-gentoo.el delete mode 100644 dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch delete mode 100644 dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10-desktop.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10-libform.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch delete mode 100644 dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch delete mode 100644 dev-util/cmake/files/cmake.vim delete mode 100644 dev-util/cmake/metadata.xml (limited to 'dev-util') diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest deleted file mode 100644 index 07d44e781cc..00000000000 --- a/dev-util/cmake/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cmake-2.8.12.tar.gz 6064138 SHA256 d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287 SHA512 39d771fb4730693b19c567b7646f41ffa3d45f488a410b9e3724f42cca1139ce091fd7b8f26c09480d0100ceb49d23177bc01cd3665fdcfb53f29bf76a2dbd13 WHIRLPOOL 42d0c1dc825ba25bc73fb9068011fa71ea088922c96d12e471cae1a25c7f89825962b698373d4d96a03b29c4683e1d5ef3306ab4c1150c14db560d165e4a92f8 diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild deleted file mode 100644 index bfd1f2c6a3c..00000000000 --- a/dev-util/cmake/cmake-2.8.12.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.1 2013/09/11 18:00:59 kensington Exp $ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 qt5 vim-syntax" - -REQUIRED_USE="?? ( qt4 qt5 )" - -DEPEND=" - >=app-arch/libarchive-2.8.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - ncurses? ( sys-libs/ncurses ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch - "${FILESDIR}"/${PN}-2.8.10-desktop.patch - "${FILESDIR}"/${PN}-2.8.10-libform.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch - "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch - "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # CTest.updatecvs, which fails to commit as root - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el deleted file mode 100644 index e4a1a6d47cb..00000000000 --- a/dev-util/cmake/files/50cmake-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) -(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) -(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011c8f7..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch deleted file mode 100644 index ceb205ff586..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch by Heiko Przybyl - ---- Source/cmComputeLinkInformation.cxx -+++ Source/cmComputeLinkInformation.cxx -@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge - for(std::vector::const_iterator ri = runtimeDirs.begin(); - ri != runtimeDirs.end(); ++ri) - { -+ // Do not add duplicates. -+ // I'd like to have that check already in the list generation code -+ // but that would need lots of more changes, even in ExpandListArgument(). -+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) -+ { -+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; -+ continue; -+ } - // Separate from previous path. - rpath += sep; - sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch deleted file mode 100644 index 4ef0c7b4b6f..00000000000 --- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch +++ /dev/null @@ -1,20 +0,0 @@ -The install_name of a library can be compared to the ELF soname, setting -it to just the library name (libx.1.dylib) is not sufficient on Mach-O, -as it uses full paths. Most apps have no clue about that, so they don't -do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html - -Provide a sane default that will allow merging most cmake-based -packages. If this location is not correct, Portage's QA checks will -catch that. - ---- Source/cmTarget.cxx -+++ Source/cmTarget.cxx -@@ -974,7 +974,7 @@ - this->Makefile->IsOn("MINGW")); - - // Setup default property values. -- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); -+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); - this->SetPropertyDefault("INSTALL_RPATH", ""); - this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); - this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch deleted file mode 100644 index 9cb4777cc9b..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - ---- Modules/Platform/Darwin.cmake -+++ 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 "") - -@@ -48,7 +48,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 ".dylib" ".so" ".a") -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".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 diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch deleted file mode 100644 index 97c93aa5831..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch +++ /dev/null @@ -1,50 +0,0 @@ -Do not detect Xcode and set -isysroot for its SDK, since that messes up -our toolchain, and hence makes any compilation fail, bug #445308 - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -60,18 +60,18 @@ - endif() - - # Ask xcode-select where to find /Developer or fall back to ancient location. --execute_process(COMMAND xcode-select -print-path -- OUTPUT_VARIABLE _stdout -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_VARIABLE _stderr -- RESULT_VARIABLE _failed) --if(NOT _failed AND IS_DIRECTORY ${_stdout}) -- set(OSX_DEVELOPER_ROOT ${_stdout}) --elseif(IS_DIRECTORY "/Developer") -- set(OSX_DEVELOPER_ROOT "/Developer") --else() -+#execute_process(COMMAND xcode-select -print-path -+# OUTPUT_VARIABLE _stdout -+# OUTPUT_STRIP_TRAILING_WHITESPACE -+# ERROR_VARIABLE _stderr -+# RESULT_VARIABLE _failed) -+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) -+# set(OSX_DEVELOPER_ROOT ${_stdout}) -+#elseif(IS_DIRECTORY "/Developer") -+# set(OSX_DEVELOPER_ROOT "/Developer") -+#else() - set(OSX_DEVELOPER_ROOT "") --endif() -+#endif() - - execute_process(COMMAND sw_vers -productVersion - OUTPUT_VARIABLE CURRENT_OSX_VERSION -@@ -91,10 +91,10 @@ - # CMAKE_OSX_DEPLOYMENT_TARGET - - # Set cache variable - end user may change this during ccmake or cmake-gui configure. --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") --endif() -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") -+#endif() - - #---------------------------------------------------------------------------- - # CMAKE_OSX_SYSROOT diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch deleted file mode 100644 index e0cefa9ceaf..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop -index 645eb76..7be495f 100644 ---- a/Source/QtDialog/CMake.desktop -+++ b/Source/QtDialog/CMake.desktop -@@ -3,7 +3,7 @@ Version=1.0 - Name=CMake - Comment=Cross-platform buildsystem - Exec=cmake-gui %f --Icon=CMakeSetup32.png -+Icon=CMakeSetup32 - Terminal=false - X-MultipleArgs=false - Type=Application diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch deleted file mode 100644 index 052cc30699f..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10-libform.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea1c033..ae479ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) - else () - set(BUILD_CursesDialog 0) - endif () -- if(BUILD_CursesDialog) -- add_subdirectory(Source/CursesDialog/form) -- endif() - endmacro () - - #----------------------------------------------------------------------- -diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt -index 96e28b4..4102379 100644 ---- a/Source/CursesDialog/CMakeLists.txt -+++ b/Source/CursesDialog/CMakeLists.txt -@@ -25,13 +25,16 @@ set( CURSES_SRCS - CursesDialog/ccmake - ) - --include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form -- ${CMake_BINARY_DIR}/Source/CursesDialog/form) - include_directories(${CURSES_INCLUDE_PATH}) - - - add_executable(ccmake ${CURSES_SRCS} ) - target_link_libraries(ccmake CMakeLib) --target_link_libraries(ccmake cmForm) -+TARGET_LINK_LIBRARIES(ccmake form) -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) -+IF(CURSES_EXTRA_LIBRARY) -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) -+ENDIF(CURSES_EXTRA_LIBRARY) -+ - - install_targets(/bin ccmake) -diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h -index b157a28..f131ea4 100644 ---- a/Source/CursesDialog/cmCursesStandardIncludes.h -+++ b/Source/CursesDialog/cmCursesStandardIncludes.h -@@ -15,8 +15,6 @@ - #define _MSE_INT_H - #endif - --#include -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch deleted file mode 100644 index a7e8688ec87..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -60,6 +60,10 @@ - - list(APPEND _Python_NAMES python) - -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ set(_Python_NAMES python) -+endif() -+ - # Search for the current active python version first - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) - -@@ -76,7 +80,7 @@ - unset(_PYTHON3_VERSIONS) - - # Search for newest python version if python executable isn't found --if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) - set(_Python_NAMES python${_CURRENT_VERSION}) - if(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch deleted file mode 100644 index 2a83ff7abb6..00000000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index bffa9fb..8fc90ee 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -74,6 +74,19 @@ set(_Python_VERSIONS - ${_PYTHON_FIND_OTHER_VERSIONS} - ) - -+# Gentoo portage requires that you use exactly the given python version -+if (CMAKE_BUILD_T