From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rld0K-0007nT-JE for garchives@archives.gentoo.org; Fri, 13 Jan 2012 09:00:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A340FE04EC; Fri, 13 Jan 2012 09:00:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 499FAE04EC for ; Fri, 13 Jan 2012 09:00:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF0731B4017 for ; Fri, 13 Jan 2012 09:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EE63880044 for ; Fri, 13 Jan 2012 09:00:45 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.6-r5.ebuild dev-util/cmake/files/50cmake-gentoo.el dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch dev-util/cmake/files/cmake-2.8.1-libform.patch dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch dev-util/cmake/files/cmake-2.8.6-FindBoost.patch dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch dev-util/cmake/files/cmake-2.8.6-testsvn17.patch dev-util/cmake/files/cmake.vim dev-util/cmake/metadata.xml X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: d1742db94e44817130ab96eed8343e96068e937d Date: Fri, 13 Jan 2012 09:00:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b0318231-36e0-4239-a65b-5872a547ac7b X-Archives-Hash: 73b7499400c6d45d27b9d6fea5dca6e5 commit: d1742db94e44817130ab96eed8343e96068e937d Author: Johannes Huber gentoo org> AuthorDate: Fri Jan 13 09:02:13 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Jan 13 09:02:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dd1742db9 [dev-util/cmake] Revision bump. Adds new FindBoost.cmake patch which fixe= s bug 335108. (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit) --- dev-util/cmake/cmake-2.8.6-r5.ebuild | 178 ++++++++++++++= ++++++ dev-util/cmake/files/50cmake-gentoo.el | 4 + .../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 +++ .../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 +++ dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++ .../files/cmake-2.8.3-more-no_host_paths.patch | 109 ++++++++++++ .../cmake/files/cmake-2.8.3-ruby_libname.patch | 12 ++ dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch | 34 ++++ dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch | 35 ++++ dev-util/cmake/files/cmake-2.8.6-FindBoost.patch | 46 +++++ .../cmake/files/cmake-2.8.6-FindLAPACK-2.patch | 34 ++++ dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 ++++ dev-util/cmake/files/cmake.vim | 3 + dev-util/cmake/metadata.xml | 5 + 16 files changed, 641 insertions(+), 0 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.6-r5.ebuild b/dev-util/cmake/cmake-= 2.8.6-r5.ebuild new file mode 100644 index 0000000..b704c83 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.6-r5.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,= v 1.6 2012/01/04 16:36:22 ranger Exp $ + +EAPI=3D4 + +CMAKE_REMOVE_MODULES=3D"no" +inherit elisp-common toolchain-funcs eutils versionator flag-o-matic bas= e cmake-utils virtualx + +MY_P=3D"${PN}-$(replace_version_separator 3 - ${MY_PV})" + +DESCRIPTION=3D"Cross platform Make" +HOMEPAGE=3D"http://www.cmake.org/" +SRC_URI=3D"http://www.cmake.org/files/v$(get_version_component_range 1-2= )/${MY_P}.tar.gz" + +LICENSE=3D"CMake" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-inte= rix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solar= is ~x64-solaris ~x86-solaris" +SLOT=3D"0" +IUSE=3D"emacs ncurses qt4 vim-syntax" + +DEPEND=3D" + >=3Dapp-arch/libarchive-2.8.0 + >=3Dnet-misc/curl-7.20.0-r1[ssl] + >=3Ddev-libs/expat-2.0.1 + dev-util/pkgconfig + sys-libs/zlib + ncurses? ( sys-libs/ncurses ) + qt4? ( x11-libs/qt-gui:4 ) +" +RDEPEND=3D"${DEPEND} + emacs? ( virtual/emacs ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +SITEFILE=3D"50${PN}-gentoo.el" +VIMFILE=3D"${PN}.vim" + +S=3D"${WORKDIR}/${MY_P}" + +CMAKE_BINARY=3D"${S}/Bootstrap.cmk/cmake" + +# Fixme: +# Boost patchset is foobared and should respect eselect / slotting +PATCHES=3D( + "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch + "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch + "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch + "${FILESDIR}"/${PN}-2.8.1-libform.patch + "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch + "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch + "${FILESDIR}"/${PN}-2.8.6-FindBoost.patch + "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch + "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch + "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch + "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch +) +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=3D?|[[:space:]]*)[[:digit:= ]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=3D$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=3D?|[[:space:= ]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') + par_arg=3D"--parallel=3D${par_arg}" + else + par_arg=3D"--parallel=3D1" + fi + + tc-export CC CXX LD + + ./bootstrap \ + --prefix=3D"${T}/cmakestrap/" \ + ${par_arg} \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir test + # this is altered thanks to our eclass + sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die + + pushd "${CMAKE_BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs=3D"--extra-verbose --output-on-fa= ilure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the tes= t + # as it was never intended to be used this way. + "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ + -E BootstrapTest SimpleCOnly_sdcc \ + || die "Tests failed" + + popd > /dev/null +} + +pkg_setup() { + einfo "Fixing java access violations ..." + # bug 387227 + addpredict /proc/self/coredump_filter +} + +src_prepare() { + base_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=3D$(java-config -g JAVA_HOME 2> /dev/null) + + local mycmakeargs=3D( + -DCMAKE_USE_SYSTEM_LIBRARIES=3DON + -DCMAKE_INSTALL_PREFIX=3D"${EPREFIX}"/usr + -DCMAKE_DOC_DIR=3D/share/doc/${PF} + -DCMAKE_MAN_DIR=3D/share/man + -DCMAKE_DATA_DIR=3D/share/${PN} + $(cmake-utils_use_build ncurses CursesDialog) + $(cmake-utils_use_build qt4 QtDialog) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use emacs && elisp-compile Docs/cmake-mode.el +} + +src_test() { + VIRTUALX_COMMAND=3D"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/file= s/50cmake-gentoo.el new file mode 100644 index 0000000..e4a1a6d --- /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-darwin-bundle.patch b/dev-u= til/cmake/files/cmake-2.6.3-darwin-bundle.patch new file mode 100644 index 0000000..6ee9b70 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-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 +@@ -23,7 +23,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 "") +=20 +@@ -45,7 +45,7 @@ + SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -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") +=20 + # 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.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 0000000..02c3011 --- /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=3D7933 + +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:1= 8:32 2008 +@@ -38,6 +38,13 @@ + int main() { return 0; } + #endif +=20 ++#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 +=20 ++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=3D1 ++ echo "LFS support available" ++else ++ KWSYS_LFS_AVAILABLE=3D0 ++ echo "LFS support unavailable, disabled" ++fi ++ + if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" =3D "x0" ]; then + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_= STL_HAVE_STD=3D${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patc= h b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch new file mode 100644 index 0000000..ceb205f --- /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 =3D runtimeDirs.begin= (); + ri !=3D runtimeDirs.end(); ++ri) + { ++ // Do not add duplicates. ++ // I'd like to have that check already in the list generation cod= e ++ // but that would need lots of more changes, even in ExpandListAr= gument(). ++ if(*sep !=3D '\0' && (rpath + sep).find(*ri + sep) !=3D std::stri= ng::npos) ++ { ++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << = rpath << "'" << std::endl; ++ continue; ++ } + // Separate from previous path. + rpath +=3D sep; + sep =3D 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.pat= ch new file mode 100644 index 0000000..4ef0c7b --- /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")); +=20 + // 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.1-libform.patch b/dev-util/cm= ake/files/cmake-2.8.1-libform.patch new file mode 100644 index 0000000..87c7247 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch @@ -0,0 +1,50 @@ +diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt +--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +010= 0 ++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 +@@ -314,9 +314,6 @@ + ELSE (UNIX) + SET(BUILD_CursesDialog 0) + ENDIF (UNIX) +- IF(BUILD_CursesDialog) +- ADD_SUBDIRECTORY(Source/CursesDialog/form) +- ENDIF(BUILD_CursesDialog) + ENDMACRO (CMAKE_BUILD_UTILITIES) +=20 +=20 +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2= .8.1/Source/CursesDialog/CMakeLists.txt +--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:= 29:34.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.0= 00000000 +0200 +@@ -25,13 +25,18 @@ + CursesDialog/ccmake + ) +=20 +-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) +=20 +=20 + 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) ++ +=20 + INSTALL_TARGETS(/bin ccmake) ++ ++ +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardInclud= es.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h +--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 20= 10-03-16 21:29:35.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-0= 4 20:01:38.000000000 +0200 +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif +=20 +-#include +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/= dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch new file mode 100644 index 0000000..38bad92 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch @@ -0,0 +1,109 @@ +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.3/Modules/Platform/Darwin.cmake ++++ cmake-2.8.3/Modules/Platform/Darwin.cmake +@@ -217,19 +217,23 @@ +=20 +=20 + =20 +-# 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) +=20 +-# 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) +diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/= Modules/Platform/UnixPaths.cmake +--- cmake-2.8.3/Modules/Platform/UnixPaths.cmake ++++ cmake-2.8.3/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 / +=20 + # CMake install location +@@ -44,43 +45,39 @@ +=20 + # 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 =20 +- /usr/openwin/include ++ @GENTOO_PORTAGE_EPREFIX@usr/include + ) +=20 + 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=20 +- /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 + ) +=20 + LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ @GENTOO_PORTAGE_EPREFIX@usr/bin ++ @GENTOO_PORTAGE_EPREFIX@bin + ) +=20 + 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 + ) +=20 + 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 + ) +=20 diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-ut= il/cmake/files/cmake-2.8.3-ruby_libname.patch new file mode 100644 index 0000000..45d2b16 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch @@ -0,0 +1,12 @@ +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.5971634= 98 +0100 ++++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0= 100 +@@ -180,7 +180,7 @@ +=20 +=20 + # 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}) +=20 + 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 new file mode 100644 index 0000000..8a8fe6f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch @@ -0,0 +1,34 @@ +From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001 +From: Clinton Stimpson +Date: Wed, 5 Oct 2011 10:02:32 -0600 +Subject: [PATCH] Fix XML safety issue with adding preprocessor defines i= n CodeBlocks project. + +--- + Source/cmExtraCodeBlocksGenerator.cxx | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeB= locksGenerator.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" +=20 + #include +=20 +@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGene= ratedFileStream& fout, + for(std::vector::const_iterator di =3D defs.begin(); + di !=3D defs.end(); ++di) + { +- fout <<" c_str() << "\" /= >\n"; ++ cmXMLSafe safedef(di->c_str()); ++ fout <<" \n"; + } + } +=20 +--=20 +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 new file mode 100644 index 0000000..16b6480 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch @@ -0,0 +1,35 @@ +diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/Fi= ndBLAS.cmake +--- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.00000000= 0 +0200 ++++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +01= 00 +@@ -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 BL= AS + # 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.) +=20 ++# ++# 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 mor= e extensive search.") ++ + include(CheckFunctionExists) + include(CheckFortranFunctionExists) +=20 +@@ -622,3 +636,6 @@ + endif(BLA_F95) +=20 + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXE= S}) ++ ++endif(NOT BLAS_FOUND) ++ diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch b/dev-util/= cmake/files/cmake-2.8.6-FindBoost.patch new file mode 100644 index 0000000..d4d4e94 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch @@ -0,0 +1,46 @@ +From c7a600899bc3ca186ea1049af80bdc50b0d9ac49 Mon Sep 17 00:00:00 2001 +From: Johannes Huber +Date: Fri, 13 Jan 2012 09:29:35 +0100 +Subject: [PATCH] Use eselected version in non exact version find operati= on. + Fixes gentoo bug + https://bugs.gentoo.org/show_bug.cgi?id=3D335108. + +--- + Modules/FindBoost.cmake | 14 +++++++++++--- + 1 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 9c03b3d..9ccda31 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -73,6 +73,9 @@ + # binary Boost releases do so. + # + # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0") ++ ++# Some future versions to be safe ++set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" = "1.48") + # + # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D + # +@@ -658,9 +661,14 @@ else(_boost_IN_CACHE) + _boost_BOOSTIFIED_VERSION ${_boost_VER}) + endif() +=20 +- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSI= ON}") +- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSI= ON}") +- ++ # Rely only on eselected sym link version in gentoo ++ # in case of no exact version version search. ++ # See https://bugs.gentoo.org/show_bug.cgi?id=3D335108 ++ if( Boost_FIND_VERSION_EXACT ) ++ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERS= ION}") ++ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERS= ION}") ++ endif( Boost_FIND_VERSION_EXACT ) ++ =20 + endforeach(_boost_VER) +=20 + if(Boost_DEBUG) +--=20 +1.7.8.3 + diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-ut= il/cmake/files/cmake-2.8.6-FindLAPACK-2.patch new file mode 100644 index 0000000..579a07d --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch @@ -0,0 +1,34 @@ +--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933= 106 +0800 ++++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144= 646 +0800 +@@ -1,3 +1,9 @@=20 ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration is found, this overrides and cance= ls ++# all further checks. ++# ++ + # - Find LAPACK library + # This module finds an installed fortran library that implements the LA= PACK + # linear-algebra interface (see http://www.netlib.org/lapack/). +@@ -36,6 +42,14 @@=20 + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) +=20 ++# ++# 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 m= ore extensive search.") ++ + set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFI= XES}) +=20 + get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) +@@ -304,4 +318,6 @@=20 + endif(NOT LAPACK_FIND_QUIETLY) + endif(BLA_F95) +=20 + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFI= XES}) ++ ++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 new file mode 100644 index 0000000..7746767 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch @@ -0,0 +1,30 @@ +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) +=20 ++# 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=3Dempty") ++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 d= irs_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( diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.= vim new file mode 100644 index 0000000..5cecd7d --- /dev/null +++ b/dev-util/cmake/files/cmake.vim @@ -0,0 +1,3 @@ +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! in= dent/cmake.vim=20 +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 0000000..a23f444 --- /dev/null +++ b/dev-util/cmake/metadata.xml @@ -0,0 +1,5 @@ + + + + kde +