| 1 |
commit: a9d026ede38de3254565a5fa62c09b14746571e3 |
| 2 |
Author: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 1 22:16:25 2012 +0000 |
| 4 |
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue May 1 22:16:25 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a9d026ed |
| 7 |
|
| 8 |
[dev-util/cmake] Added patch to remove failing tests, removed RESTRICT |
| 9 |
|
| 10 |
--- |
| 11 |
dev-util/cmake/cmake-2.8.8.ebuild | 4 +- |
| 12 |
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 ++++++++++++++++++++++++++ |
| 13 |
2 files changed, 59 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild |
| 16 |
index 11db0c4..1386340 100644 |
| 17 |
--- a/dev-util/cmake/cmake-2.8.8.ebuild |
| 18 |
+++ b/dev-util/cmake/cmake-2.8.8.ebuild |
| 19 |
@@ -18,9 +18,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 |
| 20 |
SLOT="0" |
| 21 |
IUSE="emacs ncurses qt4 vim-syntax" |
| 22 |
|
| 23 |
-#Test 62 wiped out /usr/local/, restricting until that's fixed |
| 24 |
-RESTRICT="test" |
| 25 |
- |
| 26 |
DEPEND=" |
| 27 |
>=app-arch/libarchive-2.8.0 |
| 28 |
>=net-misc/curl-7.20.0-r1[ssl] |
| 29 |
@@ -62,6 +59,7 @@ PATCHES=( |
| 30 |
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch |
| 31 |
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
| 32 |
"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch |
| 33 |
+ "${FILESDIR}"/${PN}-2.8.8-tests.patch |
| 34 |
) |
| 35 |
cmake_src_bootstrap() { |
| 36 |
# Cleanup args to extract only JOBS. |
| 37 |
|
| 38 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch |
| 39 |
new file mode 100644 |
| 40 |
index 0000000..64af9d3 |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch |
| 43 |
@@ -0,0 +1,58 @@ |
| 44 |
+Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root |
| 45 |
+--- cmake-2.8.8/Tests/CMakeLists.txt |
| 46 |
++++ cmake-2.8.8/Tests/CMakeLists.txt |
| 47 |
+@@ -273,23 +273,6 @@ |
| 48 |
+ ) |
| 49 |
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") |
| 50 |
+ |
| 51 |
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) |
| 52 |
+- # this test also depends on the existence of the standard qtiff plugin |
| 53 |
+- if(QT4_WORKS AND QT_QTSQL_FOUND) |
| 54 |
+- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND} |
| 55 |
+- --build-and-test |
| 56 |
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" |
| 57 |
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" |
| 58 |
+- --build-generator ${CMAKE_TEST_GENERATOR} |
| 59 |
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} |
| 60 |
+- --build-project Qt4Deploy |
| 61 |
+- --build-options |
| 62 |
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} |
| 63 |
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} |
| 64 |
+- ) |
| 65 |
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") |
| 66 |
+- endif() |
| 67 |
+- |
| 68 |
+ endif() |
| 69 |
+ endif() |
| 70 |
+ |
| 71 |
+@@ -1548,30 +1531,6 @@ |
| 72 |
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") |
| 73 |
+ ENDIF(Subversion_FOUND) |
| 74 |
+ |
| 75 |
+- # Test CTest Update with CVS |
| 76 |
+- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
| 77 |
+- FIND_PACKAGE(CVS QUIET) |
| 78 |
+- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
| 79 |
+- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs) |
| 80 |
+- SET(CVS_FOUND ${CVS_EXECUTABLE}) |
| 81 |
+- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
| 82 |
+- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) |
| 83 |
+- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) |
| 84 |
+- IF("${CVS_EXECUTABLE}" MATCHES "cygwin") |
| 85 |
+- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") |
| 86 |
+- SET(CTEST_TEST_UPDATE_CVS 0) |
| 87 |
+- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin") |
| 88 |
+- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) |
| 89 |
+- IF(CTEST_TEST_UPDATE_CVS) |
| 90 |
+- SET(CTestUpdateCVS_DIR "CTest UpdateCVS") |
| 91 |
+- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" |
| 92 |
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) |
| 93 |
+- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} |
| 94 |
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" |
| 95 |
+- ) |
| 96 |
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") |
| 97 |
+- ENDIF(CTEST_TEST_UPDATE_CVS) |
| 98 |
+- |
| 99 |
+ # Test CTest Update with BZR |
| 100 |
+ FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr) |
| 101 |
+ MARK_AS_ADVANCED(BZR_EXECUTABLE) |
Archives