1 |
johu 13/11/30 13:55:10 |
2 |
|
3 |
Added: cmake-2.8.11.2-hppa-bootstrap.patch |
4 |
Log: |
5 |
Add upstream patch to fix linking while bootstrap on hppa fixes bug #473276. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: cmake-2.8.11.2-hppa-bootstrap.patch |
16 |
=================================================================== |
17 |
From: Rolf Eike Beer <eike@×××××××.de> |
18 |
Date: Thu, 12 Sep 2013 18:59:11 +0000 (+0200) |
19 |
Subject: bootstrap: try better workaround for builds on Linux/HPPA |
20 |
X-Git-Tag: v2.8.12~21^2 |
21 |
X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd |
22 |
|
23 |
bootstrap: try better workaround for builds on Linux/HPPA |
24 |
|
25 |
The workaround currently present works fine without -O or with -O1, but fails |
26 |
with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in |
27 |
bugs like this: |
28 |
|
29 |
https://bugs.gentoo.org/473276 |
30 |
|
31 |
Prevent the workaround for higher optimization levels to make bootstrapping |
32 |
more likely to succeed. |
33 |
|
34 |
This is still a workaround as ld still keeps crashing in some situations. |
35 |
--- |
36 |
|
37 |
diff --git a/bootstrap b/bootstrap |
38 |
index fb4a0a0..9784d5d 100755 |
39 |
--- a/bootstrap |
40 |
+++ b/bootstrap |
41 |
@@ -692,7 +692,10 @@ if ${cmake_system_linux}; then |
42 |
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
43 |
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
44 |
if ${cmake_machine_parisc}; then |
45 |
- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" |
46 |
+ # if -O[s23] is given the effect is inverted, so do not use the flag then |
47 |
+ if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then |
48 |
+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" |
49 |
+ fi |
50 |
fi |
51 |
fi |