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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Wed Feb 5 16:10:57 2014 UTC (5 months, 3 weeks ago) by kensington
Branch: MAIN
CVS Tags: HEAD
Backport patch from upstream fixing linking during bootstrap on HPPA wrt bug #499922.

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

1 diff --git a/CompileFlags.cmake b/CompileFlags.cmake
2 index 20f5dec..24ac58d 100644
3 --- a/CompileFlags.cmake
4 +++ b/CompileFlags.cmake
5 @@ -66,5 +66,5 @@ endif ()
6 # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
7 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
8 if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
9 - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
10 + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
11 endif ()
12 diff --git a/bootstrap b/bootstrap
13 index 9784d5d..51d067e 100755
14 --- a/bootstrap
15 +++ b/bootstrap
16 @@ -692,10 +692,7 @@ if ${cmake_system_linux}; then
17 # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
18 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
19 if ${cmake_machine_parisc}; then
20 - # if -O[s23] is given the effect is inverted, so do not use the flag then
21 - if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
22 - cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
23 - fi
24 + cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
25 fi
26 fi
27

  ViewVC Help
Powered by ViewVC 1.1.20