[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.11.2-hppa-bootstrap.patch

[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.11.2-hppa-bootstrap.patch

[Johannes Huber (johu)]

johu        13/11/30 13:55:10

  Added:                cmake-2.8.11.2-hppa-bootstrap.patch
  Log:
  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)

Revision  Changes    Path
1.1                  dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch

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
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

Index: cmake-2.8.11.2-hppa-bootstrap.patch
===================================================================
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Thu, 12 Sep 2013 18:59:11 +0000 (+0200)
Subject: bootstrap: try better workaround for builds on Linux/HPPA
X-Git-Tag: v2.8.12~21^2
X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd

bootstrap: try better workaround for builds on Linux/HPPA

The workaround currently present works fine without -O or with -O1, but fails
with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in
bugs like this:

https://bugs.gentoo.org/473276

Prevent the workaround for higher optimization levels to make bootstrapping
more likely to succeed.

This is still a workaround as ld still keeps crashing in some situations.
---

diff --git a/bootstrap b/bootstrap
index fb4a0a0..9784d5d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -692,7 +692,10 @@ 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
-    cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
+    # 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
   fi
 fi

[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.11.2-hppa-bootstrap.patch

[Jeroen Roovers (jer)]

jer         14/01/15 15:54:22

  Modified:             cmake-2.8.11.2-hppa-bootstrap.patch
  Log:
  Fix HPPA bootstrap/linker patch to properly handle C++ code by Guy Martin.
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch?r1=1.1&r2=1.2

Index: cmake-2.8.11.2-hppa-bootstrap.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.8.11.2-hppa-bootstrap.patch	30 Nov 2013 13:55:10 -0000	1.1
+++ cmake-2.8.11.2-hppa-bootstrap.patch	15 Jan 2014 15:54:22 -0000	1.2
@@ -1,35 +1,20 @@
-From: Rolf Eike Beer <eike@sf-mail.de>
-Date: Thu, 12 Sep 2013 18:59:11 +0000 (+0200)
-Subject: bootstrap: try better workaround for builds on Linux/HPPA
-X-Git-Tag: v2.8.12~21^2
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=ca63bb1001dea6929e194ac15921fdeb7d434dcd
-
-bootstrap: try better workaround for builds on Linux/HPPA
-
-The workaround currently present works fine without -O or with -O1, but fails
-with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in
-bugs like this:
-
-https://bugs.gentoo.org/473276
-
-Prevent the workaround for higher optimization levels to make bootstrapping
-more likely to succeed.
-
-This is still a workaround as ld still keeps crashing in some situations.
----
-
-diff --git a/bootstrap b/bootstrap
-index fb4a0a0..9784d5d 100755
+--- a/CompileFlags.cmake
++++ b/CompileFlags.cmake
+@@ -66,5 +66,5 @@
+ # 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 ()
 --- a/bootstrap
 +++ b/bootstrap
-@@ -692,7 +692,10 @@ if ${cmake_system_linux}; then
+@@ -691,7 +691,7 @@
    # 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
 -    cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
-+    # 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
\ No newline at end of file
+ fi
+