| 1 |
kensington 14/02/05 16:10:57 |
| 2 |
|
| 3 |
Added: cmake-2.8.12.2-hppa-bootstrap.patch |
| 4 |
Log: |
| 5 |
Backport patch from upstream fixing linking during bootstrap on HPPA wrt bug #499922. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.12.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.12.2-hppa-bootstrap.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cmake-2.8.12.2-hppa-bootstrap.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/CompileFlags.cmake b/CompileFlags.cmake |
| 18 |
index 20f5dec..24ac58d 100644 |
| 19 |
--- a/CompileFlags.cmake |
| 20 |
+++ b/CompileFlags.cmake |
| 21 |
@@ -66,5 +66,5 @@ endif () |
| 22 |
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
| 23 |
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
| 24 |
if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) |
| 25 |
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") |
| 26 |
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") |
| 27 |
endif () |
| 28 |
diff --git a/bootstrap b/bootstrap |
| 29 |
index 9784d5d..51d067e 100755 |
| 30 |
--- a/bootstrap |
| 31 |
+++ b/bootstrap |
| 32 |
@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then |
| 33 |
# avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
| 34 |
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
| 35 |
if ${cmake_machine_parisc}; then |
| 36 |
- # if -O[s23] is given the effect is inverted, so do not use the flag then |
| 37 |
- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then |
| 38 |
- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" |
| 39 |
- fi |
| 40 |
+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" |
| 41 |
fi |
| 42 |
fi |
Archives