Add upstream patch to fix linking while bootstrap on hppa fixes bug #473276.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 58 insertions, 17 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 20d8cf16e0bc..e8cfc6ed552d 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.261 2013/11/13 18:26:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.262 2013/11/30 13:55:10 johu Exp $
+
+  30 Nov 2013; Johannes Huber <johu@gentoo.org>
+  +files/cmake-2.8.11.2-hppa-bootstrap.patch, cmake-2.8.11.2.ebuild:
+  Add upstream patch to fix linking while bootstrap on hppa fixes bug #473276.
 
 *cmake-2.8.12.1-r1 (13 Nov 2013)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 70f84d4675dc..1097af6e0631 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,6 +18,7 @@ AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2
 AUX cmake-2.8.11-FindBoost-python.patch 5287 SHA256 95784f74c82fd412d81c850ccea8e2b0e333084dbd3dcaca3d2316986828e5c6 SHA512 db6ab343d3497ac2314250d094d4b608e83ca9d7f5c04d3b98e4461bd4655e155c189c39adffa9d31264564de6e382e227ba70c8c6ee8ab14dd8dbb7004490ef WHIRLPOOL 16358f1d91bd8ab79d51d3a772380b4e0d9ca65443dff685109e88e0c383f4edd181fdf7737cea7f8527684143704ba9154b3569dbe31ab34c9fdd2606c6487b
 AUX cmake-2.8.11-FindImageMagick.patch 3033 SHA256 721b1eee4fdc8374782276a1de719fb52df794c2ef6a9cd37d66ee99c08dabca SHA512 701e9583a63ee67a79ea6fea164ac5d3d46fed3a72f297b771fd55236ec51de6c3f1161f527b9d662382a3e9e48f3b36b3a9bdf89c20888ccab30dae64697754 WHIRLPOOL 8e16438957c9d51b497f876a4a4776807e651be0947342469e4058e74a1e0be008f8a697a554e87de0931a02072eed07f4a7e1ef1805312146e2d0c0e012d8a8
 AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1
+AUX cmake-2.8.11.2-hppa-bootstrap.patch 1367 SHA256 6c73ea01967bfe17ee6703a8d0af9bd0afd6a6d5aba5a0f307df2f6adebcbdd4 SHA512 916302c0aac92d8411bacbb4cfb85630140ad99ff7a380c3ab602766e46f25894f3c4ca72625cdd16e7152f5b7fe31d1bbc38d0366e65333803c954fb96c98c6 WHIRLPOOL d355b079c5de61dc0b2b1567e747c324653eb66ab9800b893584df8de3c6e0379bbf1699d792271e8a386672a4bff07cad9f9d4f1999f596069f71b22e5fa6ad
 AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
 AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a
 AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc
@@ -28,24 +29,24 @@ DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e1
 DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 SHA512 05ac2293300bf15fdcf98f07dfa7b9862b117cd0d6f7e30c1995ecb8a3bfd94e2b7e778caaa05bc46bd88eca5afe7f6be38b1904275a9a2aeae562bfdbaeec94 WHIRLPOOL 28365c3d091eb41fdbd428d3f9de37ed547c68415bd726874587af1cefd81ed6dce8255527dbee9d3019a65cf1b1416b9f09dfb744befba4c1428da8f88e3907
 DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
-EBUILD cmake-2.8.11.2.ebuild 5354 SHA256 5e911fc1f206094703a89ab48e1e65d5b35bedf59d206b0f789dc85f3b6796a8 SHA512 061559a757f363654cf5d0cbdc444c0801a84a0ee66feb9cd4f34fd363deb61d6fe0b55525f03b52af0f7bf2e2964a8936501c8adb45928cebdf6f052706627c WHIRLPOOL abc8da5fc5e1a02f602dbdfa4fde5a0e9c20fb1d59e6792deec432c0532d819b1e435d87de2cf0b02db6228eb5ce01ea371c4cd86c91318075eb333c1fc1557f
+EBUILD cmake-2.8.11.2.ebuild 5403 SHA256 bd2362e0fce9bb2de9dfceeb2751d10e41f1085cd5eb510c0e8cac5326e09110 SHA512 b5b7e48a76871f525e220f7283b02e678760e23e62eff548d567930af9ce9ab5e86ab06d35fcfd4344ba9703f5d9af9203ab7a7b856c56803a582139e5cf7f2f WHIRLPOOL 24d88929cb0484fef02660a2b0e5092f62940c6bf4276ff81584bb8aaff60eb493099d316e0d31e6d973fd784ddf6c590a50d26af9e97b63ac153dbf7ecbddd1
 EBUILD cmake-2.8.12.1-r1.ebuild 5465 SHA256 0c263049c329949851d9ee513cd41c61c3b4f5a27780b77e5ec0a9deb64e89f9 SHA512 49e2b25fcde0b87657e6408415c1d43b76a8003cbac14ea618d8e5388ceeaa76b766b3ea65e6997798d035a88b660034ebe5405253018db8e1a9217ee99dda93 WHIRLPOOL 1d09bd458be620a3c0b57ec8cca50ace41abe8def3484bdd8dda582fb331e32c224e468349fb67e3d59b613c0653840f1f7daaffd27c036c03002020678db2c1
-MISC ChangeLog 42042 SHA256 0e3588be54125284950c75d51d4939cd64b07a2b1a4bfde45db1fa56695dbadc SHA512 407e0c9e3a75b601aa7c9d798f7c47bd996dbd1d0ac254edad1ede34f9314010aad92efa32751d51b2958df31f86f0f3187348e91dc3cb4836d29658d2ae6a67 WHIRLPOOL 988c0379773fe0fea59d8818ecc2176daf271a02aeb61bd6e55ee12208677fd26ca77b3392834df5bcd18d6f95a9a14a2d9c5e0684c4585b419baa747d6ed52d
+MISC ChangeLog 42239 SHA256 537f87804954f2885bea2aacb1b92e5978c38fcc8e38bba547a665d91b422e1f SHA512 0d16b700583150e7d740e5c99079b0c317b2f10936e97b8da9a78aed2ae146fcae0cbee63c88ee327fbed505dd30ad06ccd4cc62046fd20e19f1875f1c92fef0 WHIRLPOOL 42aacf2af5cd543ff797f9bd5fb15273e8d7c5b6cec4211f58de74df35655c83a83de20fd2eed061e3a5daa4197458ed47e8fb37467e5ae1ecd4332202f43693
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJSg8RbAAoJEGVpnaTzz9K9FbAP9jNwLhARBbZ70q0z99ZGy+/Y
-de/edjz5iDzmSIq5A2GyzGWLrMMKwdeNWS/CCJiVTL5QI7jVSom09biXCd8bUUeT
-yPxMwZYEiiQ8+VGccjaioiR5+tY+1MO2fKMFdKIabdXSIO2C2rc18R4cxX8nFNiH
-ka9ogaC6ybwEPTBe80zlshLRdIdhdYxVFbNksmPkt4gTW3i7brDSu+Qc9oRHZcjk
-QvLu/jrveYY3P9TNLguRyxanSQ6x5bmyET6H5xxQoe+jxcQ3Jjf1O9AHzNf3+1Xx
-MN3b7Xf4OLBu35LhDnmqFLfyWm1NYWikx4GwedB36oiaGJzUnchRnsCDFm+yITfx
-F5A9KOkTZPznt5Q4JWjHxpjuVepvHc4A7yWzlFV8xAccLnqR6qbJwSgP2wMepCmV
-CqG+jh0PUWUR2Xoe3P3EC7m94IaowI1PKzvfIw6FPauw0KMr15z+njD/8cf0i9lp
-WykpH07SQjRZJF4softT4KrFz21YZG2tzGq8bqaJD5m15gh6Q9J/w14wQsQ/yrmR
-kPR646zAOUdFCVQ4C8ATqM9C9GlJV2kGY9RkbX9PC06U1mSo59Re1W4GlFaBisez
-4enKl6BUdc7Q5JQSbUejgDBe3eJhbIGup6l3y8RXVu0guY7m3H+PR5nfihUV1JIf
-RGHt2SrvnoQ9NWbfosM=
-=LWe2
+iQIcBAEBCAAGBQJSme5CAAoJEGVpnaTzz9K9GywP/0vXOizERTs7YYuKSphrP7vp
+hQdzI4sZyBPA3CHjOCT/n79Q043HByyuPfUB0Jk/f6nQczJ6ut5tyDqCjfmkt7Ra
+Z21SP4SGycWy3opSHH1woK7mEN35koPL5IIDrVJRYtqJBPPaHABdJWlQVcIvq92K
+zDTHPsnnwrk4IOTtZ97YHjpiSB9qPv56FjIloOjYFjqYN7bep9lPYoiAN+AlfMeU
++BXwf+XAVIfLowF0a5iC0g9gL1vs5777dMZ9C7+mBEg544+z6pk6b2lm4asL/eSq
+RV5mNQ/NZ3s7y5PgTtTFoGbTjgwamy5vfi3UdQqkJOlWhHutZiawNzb+3+NKzbSw
+7GNcHz6SNrqFE0PJppkiMjI2FXWLTXGUxy2kewC22YS9gqQw14jo8s/7TveuJ6sj
+lj8qRPxOYDjm2llEwqcV11/DCTytMmLKmuYVOu6+2yQtBhXgNsnKjnqsLjpoG3Kp
+v4C2kl0L0n7r32QqZfaqcTT5J5hi3XjlPYombGcWIu0G2Doiz/rXMHA+/3BAWAdX
+sq0UIplGm67OnUUokdbzDoKcvIWYvxIagu1HvwBC0dim1d6uxJM29aVj7WW+J7Bw
+MI6+gbcsP8gL+j+10V0ZU54Ffhw/VGo/jZwdRaxcGWjHCLNUQJfcIfUAI//rfYCE
+0rhpgJu4Yammo99ZBHeB
+=qaIH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.11.2.ebuild b/dev-util/cmake/cmake-2.8.11.2.ebuild
index 053dc85d9358..775e3880afe5 100644
--- a/dev-util/cmake/cmake-2.8.11.2.ebuild
+++ b/dev-util/cmake/cmake-2.8.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.3 2013/10/28 22:16:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.4 2013/11/30 13:55:10 johu Exp $
 
 EAPI=5
 
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch
 	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.11.2-hppa-bootstrap.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
new file mode 100644
index 000000000000..07d648e6ea8b
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
@@ -0,0 +1,35 @@
+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
\ No newline at end of file