diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-02-05 16:11:12 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-02-05 16:11:12 +0000 |
| commit | c0ae922f6ddca156204a8e33ceb741fa92c125f0 (patch) | |
| tree | 343ac3a298136e32ff130d4adebaa601680d7f89 /dev-util/cmake/files | |
| parent | Update ChangeLog (diff) | |
| download | historical-c0ae922f6ddca156204a8e33ceb741fa92c125f0.tar.gz historical-c0ae922f6ddca156204a8e33ceb741fa92c125f0.tar.bz2 historical-c0ae922f6ddca156204a8e33ceb741fa92c125f0.zip | |
Backport patch from upstream fixing linking during bootstrap on HPPA wrt bug #499922.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch new file mode 100644 index 000000000000..99e39a2f5c8d --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch @@ -0,0 +1,27 @@ +diff --git a/CompileFlags.cmake b/CompileFlags.cmake +index 20f5dec..24ac58d 100644 +--- a/CompileFlags.cmake ++++ b/CompileFlags.cmake +@@ -66,5 +66,5 @@ endif () + # 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 () +diff --git a/bootstrap b/bootstrap +index 9784d5d..51d067e 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then + # 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 +- # 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 + |