diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-01-15 15:54:22 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-01-15 15:54:22 +0000 |
| commit | ebf4d50bcd218e8507f3f210dadf289e47274a6d (patch) | |
| tree | fd5635602b2ac60ffcc74e4d34a471d69f538829 /dev-util/cmake | |
| parent | Revert USE dependency change (bug #498176). (diff) | |
| download | gentoo-2-ebf4d50bcd218e8507f3f210dadf289e47274a6d.tar.gz gentoo-2-ebf4d50bcd218e8507f3f210dadf289e47274a6d.tar.bz2 gentoo-2-ebf4d50bcd218e8507f3f210dadf289e47274a6d.zip | |
Fix HPPA bootstrap/linker patch to properly handle C++ code by Guy Martin.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch | 41 |
2 files changed, 18 insertions, 29 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 4d2a734531db..2749a638feee 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.267 2014/01/10 01:33:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.268 2014/01/15 15:54:21 jer Exp $ + + 15 Jan 2014; Jeroen Roovers <jer@gentoo.org> + files/cmake-2.8.11.2-hppa-bootstrap.patch: + Fix HPPA bootstrap/linker patch to properly handle C++ code by Guy Martin. *cmake-2.8.12.1-r3 (10 Jan 2014) diff --git a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch index 07d648e6ea8b..9928e148882f 100644 --- a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch +++ b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch @@ -1,35 +1,20 @@ -From: Rolf Eike Beer <eike@sf-mail.de> -Date: Thu, 12 Sep 2013 18:59:11 +0000 (+0200) -Subject: bootstrap: try better workaround for builds on Linux/HPPA -X-Git-Tag: v2.8.12~21^2 -X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd - -bootstrap: try better workaround for builds on Linux/HPPA - -The workaround currently present works fine without -O or with -O1, but fails -with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in -bugs like this: - -https://bugs.gentoo.org/473276 - -Prevent the workaround for higher optimization levels to make bootstrapping -more likely to succeed. - -This is still a workaround as ld still keeps crashing in some situations. ---- - -diff --git a/bootstrap b/bootstrap -index fb4a0a0..9784d5d 100755 +--- a/CompileFlags.cmake ++++ b/CompileFlags.cmake +@@ -66,5 +66,5 @@ + # avoid binutils problem with large binaries, e.g. when building CMake in debug mode + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 + if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") + endif () --- a/bootstrap +++ b/bootstrap -@@ -692,7 +692,10 @@ if ${cmake_system_linux}; then +@@ -691,7 +691,7 @@ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 if ${cmake_machine_parisc}; then - cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" -+ # if -O[s23] is given the effect is inverted, so do not use the flag then -+ if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then -+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" -+ fi ++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" fi - fi
\ No newline at end of file + fi + |