From 27b3dd912d2cfa2940a384c7c24a778be83f17dc Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Wed, 17 Mar 2010 14:16:01 +0200 Subject: [PATCH] Update debian/patches. - drop bootstraptest_increase_timeout.diff - merged upstream; - hurd_platform.diff - adapt to upstream changes. --- debian/changelog | 3 +++ .../patches/bootstraptest_increase_timeout.diff | 17 ----------------- debian/patches/hurd_platform.diff | 5 ++--- debian/patches/series | 1 - 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 debian/patches/bootstraptest_increase_timeout.diff diff --git a/debian/changelog b/debian/changelog index 063e16a19..8097d9b9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ cmake (2.8.1-0r1) UNRELEASED; urgency=low * New upstream release. * Remove DMUA entry from debian/control. No longer needed. * Enable building in parallel (--parallel). + * Update debian/patches: + - drop bootstraptest_increase_timeout.diff - merged upstream; + - hurd_platform.diff - adapt to upstream changes. -- Modestas Vainius Sun, 06 Dec 2009 21:39:01 +0200 diff --git a/debian/patches/bootstraptest_increase_timeout.diff b/debian/patches/bootstraptest_increase_timeout.diff deleted file mode 100644 index 25b62b142..000000000 --- a/debian/patches/bootstraptest_increase_timeout.diff +++ /dev/null @@ -1,17 +0,0 @@ -Subject: increase time out for BootstrapTest to 2 hours - Default time out of 25 minutes (1500 seconds) is not enough on slow - and embedded systems (e.g. armel, s390). -Bug: http://public.kitware.com/Bug/view.php?id=9950 -Origin: upstream, cvs diff -u -r 1.154 -r 1.155 Tests/CMakeLists.txt -Forwarded: not-needed ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -1380,7 +1380,7 @@ - GET_TEST_PROPERTY(BootstrapTest TIMEOUT PREVIOUS_TIMEOUT) - IF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) - SET_TESTS_PROPERTIES ( BootstrapTest -- PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) -+ PROPERTIES TIMEOUT 5400) - ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND) - ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST) - diff --git a/debian/patches/hurd_platform.diff b/debian/patches/hurd_platform.diff index 0b86343fd..9ccfb72b2 100644 --- a/debian/patches/hurd_platform.diff +++ b/debian/patches/hurd_platform.diff @@ -13,13 +13,12 @@ Origin: other, http://public.kitware.com/Bug/file_download.php?file_id=2644&type --- a/Modules/Platform/GNU.cmake +++ b/Modules/Platform/GNU.cmake -@@ -5,6 +5,11 @@ - SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic") +@@ -4,5 +4,10 @@ + SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") +SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") - SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") +SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,") +SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") +SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic") diff --git a/debian/patches/series b/debian/patches/series index 42b11fcb1..72d0860fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -bootstraptest_increase_timeout.diff hurd_platform.diff