/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Nov 30 13:55:10 2013 UTC (9 months, 2 weeks ago) by johu
Branch: MAIN
Add upstream patch to fix linking while bootstrap on hppa fixes bug #473276.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 From: Rolf Eike Beer <eike@sf-mail.de>
2 Date: Thu, 12 Sep 2013 18:59:11 +0000 (+0200)
3 Subject: bootstrap: try better workaround for builds on Linux/HPPA
4 X-Git-Tag: v2.8.12~21^2
5 X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd
6
7 bootstrap: try better workaround for builds on Linux/HPPA
8
9 The workaround currently present works fine without -O or with -O1, but fails
10 with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in
11 bugs like this:
12
13 https://bugs.gentoo.org/473276
14
15 Prevent the workaround for higher optimization levels to make bootstrapping
16 more likely to succeed.
17
18 This is still a workaround as ld still keeps crashing in some situations.
19 ---
20
21 diff --git a/bootstrap b/bootstrap
22 index fb4a0a0..9784d5d 100755
23 --- a/bootstrap
24 +++ b/bootstrap
25 @@ -692,7 +692,10 @@ if ${cmake_system_linux}; then
26 # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
27 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
28 if ${cmake_machine_parisc}; then
29 - cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
30 + # if -O[s23] is given the effect is inverted, so do not use the flag then
31 + if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
32 + cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
33 + fi
34 fi
35 fi

  ViewVC Help
Powered by ViewVC 1.1.20