diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-23 20:39:10 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-23 20:39:10 +0000 |
| commit | f22fab1e6282b4da0256127770342ec6dd05d211 (patch) | |
| tree | 69c4e7aeeb082df14860ef6568f8cdfb61129bee /dev-util | |
| parent | Add patches to fix libgxps-0.2 and texlive-2011 support. (diff) | |
| download | gentoo-2-f22fab1e6282b4da0256127770342ec6dd05d211.tar.gz gentoo-2-f22fab1e6282b4da0256127770342ec6dd05d211.tar.bz2 gentoo-2-f22fab1e6282b4da0256127770342ec6dd05d211.zip | |
Fix test CTest.UpdateSVN with subversion-1.7, bug 390533
(Portage version: 2.1.10.37/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.6-r4.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 |
3 files changed, 37 insertions, 2 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 154d29b6c3ba..dc22fb6c5f48 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.177 2011/11/22 22:18:20 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.178 2011/11/23 20:39:10 dilfridge Exp $ + + 23 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r4.ebuild, + +files/cmake-2.8.6-testsvn17.patch: + Fix test CTest.UpdateSVN with subversion-1.7, bug 390533 22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> -files/cmake-2.8.5-FindBLAS.patch, -files/cmake-2.8.5-FindLAPACK.patch, diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild index f18e4d5ab1e5..e1db0b037907 100644 --- a/dev-util/cmake/cmake-2.8.6-r4.ebuild +++ b/dev-util/cmake/cmake-2.8.6-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.1 2011/11/22 22:15:19 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.2 2011/11/23 20:39:10 dilfridge Exp $ EAPI=4 @@ -59,6 +59,7 @@ PATCHES=( "${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. 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 000000000000..77467676c841 --- /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) + ++# Configure for this svn version. ++execute_process( ++ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add ++ ) ++if("${help_add}" MATCHES "--depth") ++ set(depth_empty "--depth=empty") ++else() ++ set(depth_empty "") ++endif() ++ + #----------------------------------------------------------------------------- + # Initialize the testing directory. + message("Creating test directory...") +@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added) + if(dirs_added) + run_child( + WORKING_DIRECTORY ${TOP}/user-source +- COMMAND ${SVNCMD} add ${dirs_added} ++ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} + ) + endif(dirs_added) + run_child( |