Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GNU.cmake file used on Hurd.

Browse Source 
Thanks to Pino Toscano for the patch.
This commit is contained in:
Modestas Vainius 2009-11-22 20:30:48 +02:00
parent 0e1661310d
commit 46e2dd5af8
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ cmake (2.8.0-3) UNRELEASED; urgency=low
buildds. buildds.
* Increase timeout of BootstrapTest to 2 hours so it no longer times out * Increase timeout of BootstrapTest to 2 hours so it no longer times out
on s390 or armel (patch bootstraptest_increase_timeout.diff). 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 <modestas@vainius.eu> Sun, 22 Nov 2009 20:05:59 +0200 -- Modestas Vainius <modestas@vainius.eu> Sun, 22 Nov 2009 20:05:59 +0200

27
debian/patches/hurd_platform.diff vendored Normal file
View File

@ -0,0 +1,27 @@
From: Pino Toscano <pino@kde.org>
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)

1
debian/patches/series vendored
View File

@ -1 +1,2 @@
bootstraptest_increase_timeout.diff bootstraptest_increase_timeout.diff
hurd_platform.diff