From 46e2dd5af85cdc1d3f6eb43bb8d778445fdd88a7 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sun, 22 Nov 2009 20:30:48 +0200 Subject: [PATCH] Fix GNU.cmake file used on Hurd. Thanks to Pino Toscano for the patch. --- debian/changelog | 1 + debian/patches/hurd_platform.diff | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/hurd_platform.diff diff --git a/debian/changelog b/debian/changelog index c0857a47c..92b59672e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ cmake (2.8.0-3) UNRELEASED; urgency=low buildds. * Increase timeout of BootstrapTest to 2 hours so it no longer times out on s390 or armel (patch bootstraptest_increase_timeout.diff). + * Fix GNU.cmake file used on Hurd. Thanks to Pino Toscano for the patch. -- Modestas Vainius Sun, 22 Nov 2009 20:05:59 +0200 diff --git a/debian/patches/hurd_platform.diff b/debian/patches/hurd_platform.diff new file mode 100644 index 000000000..0b86343fd --- /dev/null +++ b/debian/patches/hurd_platform.diff @@ -0,0 +1,27 @@ +From: Pino Toscano +Subject: Fix platform file for GNU/Hurd + Currently (both in cmake 2.6.x and cmake 2.8 as of its latest rc5), the + GNU.cmake platform file used for GNU/Hurd systems is not complete. In + particular, it needs the rpath-link flag definition, needed for properly + compiling in all the cmake setups; in particular, its miss causes the failure + of the ExportImport unit test, which instead works correctly with the proposed + patch. Also, the patch provides some more definitions, a bit close to the + Linux oones (given the base toolchain is quite close anyway, GNU-based). +Bug: http://public.kitware.com/Bug/view.php?id=9873 +Forwarded: http://public.kitware.com/Bug/view.php?id=9873 +Origin: other, http://public.kitware.com/Bug/file_download.php?file_id=2644&type=bug + +--- a/Modules/Platform/GNU.cmake ++++ b/Modules/Platform/GNU.cmake +@@ -5,6 +5,11 @@ + SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic") + 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") ++ + INCLUDE(Platform/UnixPaths) diff --git a/debian/patches/series b/debian/patches/series index 09797728d..42b11fcb1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ bootstraptest_increase_timeout.diff +hurd_platform.diff