Fix Bug 526194 - dev-lisp/sbcl-1.2.4 does not respect CFLAGS and LDFLAGS for sbcl 1.2.7. Add arm, sparc solaris and x64 solaris binaries to SRC_URI, untested and no KEYWORDS as I do not have access to this hardware. Add sbcl-1.2.7-verbose-build.patch to echo commands executed by shell scripts during the build.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 65 insertions, 18 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index c2c155c3de7f..27b606b5dd4e 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.214 2015/01/09 02:03:11 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.215 2015/01/31 04:35:14 gienah Exp $
+
+  31 Jan 2015; Mark Wright <gienah@gentoo.org>
+  +files/sbcl-1.2.7-verbose-build.patch, sbcl-1.2.7.ebuild:
+  Fix Bug 526194 - dev-lisp/sbcl-1.2.4 does not respect CFLAGS and LDFLAGS for
+  sbcl 1.2.7. Add arm, sparc solaris and x64 solaris binaries to SRC_URI,
+  untested and no KEYWORDS as I do not have access to this hardware. Add
+  sbcl-1.2.7-verbose-build.patch to echo commands executed by shell scripts
+  during the build.
 
   09 Jan 2015; redlizard <redlizard@gentoo.org> sbcl-1.2.7.ebuild:
   Added prefix keywords and fixes.
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 3e5e6fceb4c3..2db43f5e2005 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -14,6 +14,8 @@ AUX gentoo_fix_waitpid_c.patch 407 SHA256 6f0f2c40f0074f509a0f4cd38286896d6fb8f2
 AUX sbcl-1.0.55_no_doc_install.patch 1778 SHA256 aae79884a1f8dd693ef4c10129920ccbcc32bacb72e076b326c6fd6730988b9b SHA512 41b5c5274cb0465f706156444c249516db115cade23eeadd4f20fdf4a5a355fc0fc5b71c5b02c26d13c2118e63a53e0c1ccd525a44b301ffc03b8cb2c45c6ad3 WHIRLPOOL b119518fcf01a3e4bd4189e56620aa3216aeaaa6b22fa7943c75a4e07fac815e6f2490f89b5fc19b6054ce22144e6af25994824615e565af0ad6b009cc529c60
 AUX sbcl-1.0.6-solaris.patch 316 SHA256 56bc93c9ec57a6f1c73fc0849d9d11b3f945b3528396c8185b5298a3b3b6ef57 SHA512 7d1b3a7d868ac5a0c789ab34c5ea050cc7542d13666e64f5f20cc0b32cd1aa42d53bf177914bf6303c5f24d4271249128b9e15c6a889542dbc672a5b782f22c1 WHIRLPOOL 45404bdd264d64137e43ec11786e7ad4e4edc5d8b2fff89abf01776ffe5336ddd3a4fb810e0967e6f7f2625fdd96f5784dd5d712b7052270c4b25238485145c9
 AUX sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch 1024 SHA256 fe2f2e62d480bd5a593c782f14faeeb0fcd3d26507ff4f17aa19fad3a7069843 SHA512 a09efe91a082fd2bed9dc30652f3e5ed51e416697b7b2fee4d6c5f90db0ecbadca7adf652f532d79869fde9186e9d16855f5fd81321cb2a82e1a158d4cde9e97 WHIRLPOOL d475627395ceb118614dd67c1cd9d434cf62a7987bc48a16dad7b564b20daafaf5ddeb807b1bf30b572f6a10ed21b05f0b9773efa05389142762167fc806ca9f
+AUX sbcl-1.2.7-verbose-build.patch 1071 SHA256 a4b833d003e5a25bfd3b8b2a33294ea4dfe674ee7c4dec45a414d9131149378b SHA512 819282e7ee1a72e45cc0dc6fb4d8e54681e06c3093bfd41bee68c952a4073fbde549ff150158e359c430aa4fe39464413c87621f33e75200f3cad40251fd4548 WHIRLPOOL 3aa63e4a74767932aacb68b60e6e6b56bbd85e05689804275ab9915922feb19ecba82bb920868547b922df303fea2cb1c6cb5ed2fdf0db75ce55f4ac56c14c7e
+DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 34342 SHA256 13c2b44c82334d51d00f63b51a9966d073337cd806b5cff34e829063463793da SHA512 5aeaf08dc9f412df1c9a8e1ae6f8f0220f797f7506450bd12c9dfc8f2764ccc398ee782e1a1f2d9ff968ff17c0a7e89f03a1120ab3fb5f07c8e35a599d0b8140 WHIRLPOOL e0b1bcc9b910d6f05b73adf0ddb431ea026ddde6c8588801a03b02f832a260f808fbb3c3026ef7901a0f257c7f6dd9860cda30cbe44c7b4428ef8964ab106d02
 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 SHA256 0bd8125e1375a75b9dda286439dcbe9861d6df5c6fc8475fd217b8b757edf9cc SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab WHIRLPOOL 839363a0d2fcc7cf383143fc130c40bf6f03468a89eb4b5eecb39339ba376a6b3a2096938934a91cf689310bff20807d2ac24b99c0d6e3673729b26d9edb83aa
 DIST sbcl-1.0.28-powerpc-linux-binary.tar.bz2 7621107 SHA256 b51fe8cd3a998d178fc1876d10016439cfa4ed3566d761c331cacab364acd591 SHA512 e3386d25ae44c03cac5ecf2a9ba95338348b51955dc731f0bb57a124e572601b84170b452ff0c3540af07278053f1e5d153a4f1a621b376ceb1861f84777bad3 WHIRLPOOL 1c16053a0c15b3bec892811185945df59765f4d220045e0f116234aa18f843c6a6b8ce472029603624e47751185822891ffaaeb96dfd87f714b8fddf74149f26
 DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 SHA256 a2e848ac11b0f16bb91866bd187949d908ad94fabb958a0b56320fc0e8b8923e SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 WHIRLPOOL e7f7e9bc7b43cab7b729792a22f0f41be12d8dd97a1c45fa039a49607865b977dd336fef8c7ccda087a9e9e32f92241c83e05da442e12cf883d3dfb3c2fda169
@@ -32,9 +34,11 @@ DIST sbcl-1.2.4-source.tar.bz2 4486150 SHA256 f910059785ffcfa22eb40548e1355f0da9
 DIST sbcl-1.2.4-x86-64-linux-binary.tar.bz2 9450469 SHA256 c9d1c5c309bfa1dc5440ac0c6ee358415b62f87cf092131df9e7c2f718bdb2c2 SHA512 cbcfd4e3872c07cfb1cde10fee6c548c5349f9b08dc765962ca52e32f426386fa2d7160be17c68b7bdad0a648ef4acee0bd098558d9506688d0023c8147eea79 WHIRLPOOL 12079b5f4293c21b46243ce7bd7cdeac1015da7b4a26a6f9536ef5727677ead8fcf621294a900e8548262bc186b33517a9abd8bd3646a74cd08c312f7f156e6c
 DIST sbcl-1.2.6-source.tar.bz2 5460124 SHA256 4108035eebdd7af3d4a21bd7cb87443b7e9a8eb31e7f855ca2d4b4be8320f389 SHA512 7d3b453f27be0f825b6fad3fd4f58afd587c14c8c8fd60551504776cb4d75706b925260499c41044da2d519baec31373abc14e0ea7a847bc7fc9a3cacca65d9e WHIRLPOOL d1e0ce7630a831d77d3ae2645a51ed86cc808c9d3f3a0c9af070139142190e60e04df84d178c92eef21238222ecc2abb149c6600b30927e5d5d4dbdbfd46864d
 DIST sbcl-1.2.6-x86-64-linux-binary.tar.bz2 10466349 SHA256 9c21e63cc2a023d9d785621d935f6f758dcd688d8f9f30a4753eb6a1a75e2fe2 SHA512 bb2f3f70ab4429dbc1339e17856a126d720e804eb0bd7aede9d1ebe28af5cbe2e29667d54c59101f711f4e7814cec8b0c39ef3756478a1456b1cf67763761635 WHIRLPOOL 0883c771684d92dc908edb4a60a1a9fc5de948e0fc16e019e41b454bd6d3a880dc8615f6be3beb44ed2c08d8543d7ca539d531377ecbce96194f98e39ce6c68b
+DIST sbcl-1.2.7-armhf-linux-binary.tar.bz2 9914851 SHA256 5e75a328882b739befcf5c38e8039b830668a8ca7bafe56a9e13ef23f39eb253 SHA512 2c82bdfe4f070a43964e694f81ccdbb84f8dd3bf77c807343daadff877b518fcd52e05513691543ca076c2b6de8bcf8b2e672b31f5ed3f545bedb02bbf7cd868 WHIRLPOOL 8e0eab53a9bfe10a1ccaa5c950e9fe045aeaa23f9f66ca98badd5a0fce3ad5828c0059904c73584dd4591fb3f9b2eefb5210a19f2de9fd8d699d48b0cee3bbef
 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 SHA256 d2f86db4f6fe2b6e6bbc6353ce28dead1b142ed36885080b97304db55aae2861 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 WHIRLPOOL 4b884ab946e8c54775970aa502054f42a92d01257449796c7d1a6bd1ff5835ddae1c94aa5d936a7a5b115183c6cee5251034646559e4435a6663896fa302c4be
 DIST sbcl-1.2.7-source.tar.bz2 5472699 SHA256 b27099d8c9fb5c63673e7dc4a83f82b4088dd0ed02e849a4d164aa1b12cc5283 SHA512 0d5655a5362250559a06590d6c8fac223b4461697ca826d96fa87bdf86c2d133c7ca4bde7de32a04259f061d1066d389dbb5b004d717d095e4c153ae8239b36f WHIRLPOOL 9699fe67d574a63bb6dca4c9c3321c2781a8acdfd4554676951d80f13a19ee40979d3a0df182ae452ce5476413a66d7870f0a99b3b4286e118be5cbec31b644a
 DIST sbcl-1.2.7-x86-64-linux-binary.tar.bz2 10528686 SHA256 92094d7a5ea19891a6245064b12d4e1125aa065634ad24b6607ab08c37e95b40 SHA512 5d925df9022584732793121a67b6d37bab4d35b999748fbd6fd8d9c8cd212b01569bf265bf1edca33ce37b400597da21e4c66685a3f93b29548d26108ff3b5df WHIRLPOOL aa631d6a06dc67031fcb60ccecec13859a2648f9d0bf39db5ea4de62129ed8dac9592ef32acd2934e3e26e2225c4d0befdf30e7733ae4a9200498926a7193a5f
+DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e
 DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 SHA256 724425fe0d28747c7d31c6655e39fa8c27f9ef4608c482ecc60089bcc85fc31d SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c WHIRLPOOL 41b3f5a9749c74f136b8bb4f519409902045cd9501b5b944e7bcbf9336dd6640388641d26f8c345d79a1028ae64bb04fb74228886f8c2ae0eb085a8586635e17
 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 SHA256 a198df14f45cdf302017116744c8946a8b4143291efe1799553554133c22b46a SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 WHIRLPOOL 05ad3606b23e6196d443328f367b7351612d0f4991d71a5a04f1f45b5bb604809d6ed11c8cf62bc639d6f9dd8e5704b52a050603d4745713c5818fcbd36852bf
 EBUILD sbcl-1.0.55-r1.ebuild 6109 SHA256 8bbc0e38724b5a40d5c51b8d61a00bfc254265fe468e7c7f6d4963bb5cc0a0a8 SHA512 9894d9d3ae42a6b92d6fe41af9963841aec3dcc63d44b324cb959a995a4351f6bac3c92d310e1189fa541486fd413968f563e98abf5bcacb813c35357b448c8b WHIRLPOOL 5fc98f685599237989ae55ff1d099e74612129c679a6498734bf2e62716f5691225d07f510a3747c1ce9b714b0f43938bbbbb6464684119fe8562a9ecc0019fe
@@ -42,23 +46,15 @@ EBUILD sbcl-1.1.18.ebuild 6963 SHA256 b6977411bdadb9057d185ebea9a4ee5b2b7ff19d54
 EBUILD sbcl-1.2.2.ebuild 6976 SHA256 a10e756c7b49c4e68f7ec836016e8a2a689bbf32067da5546b200abcb991b107 SHA512 f7213131256d3715137daa07bc067400f02f6e2296e210c57d8c28622b8c83bce25689e6316366ae0c79f811df65ab3af7f33f85355126b29babda6324ca2e12 WHIRLPOOL d4e8b251fe028c7488ca186826307e4fa79a07126aa9f2421a8489e63bf0cd2200a7ec2dbc21dda884236c90e9daf4c302641275c4027c8b584e6cc8d0b19fd2
 EBUILD sbcl-1.2.4.ebuild 6976 SHA256 658bc0c6080c6d0ddd2e32121ff2fa5f0dc7ff0152e7ce3ddc5eac323a1e0a8f SHA512 5e6ac63fefe0b2ea6cda9d610e26d99e06b4537e9e8f508ef89d180c919087841f8fb75481d8e92da9a659237c54fd5640f5c61ecafbd651b41f680c78b39def WHIRLPOOL 803c875ed620f58428446ae96ec59eba3ad9dbf8983c23ca455bd67e78534274da22667fd6eac67c98a8bb357f6c1dbaa971414b851ae625e676ae85620427b6
 EBUILD sbcl-1.2.6.ebuild 6890 SHA256 7225e7405718576b49c79817a64c897bc7dc1926606d088d20883bf4c37d15aa SHA512 c4759650831c7d7556414eab8e683460345d61bd14c4ac8bfcc6c127ac8f1f8f0ed83fb0168149c2f454787a956145c20384b2177ad72a54e4172ac2a48448f9 WHIRLPOOL 4970001c7f0a08dfcf6e6c7e605f9728f191e130a6d5333334bef3009305c48b919cffcd9a570ddac5bfbce80d1c8ff2ad3348d0efef8d42083370be7a3e465c
-EBUILD sbcl-1.2.7.ebuild 7708 SHA256 bdd9569ad65e5254e26d98f74e477de6e9f00836c82f0235226904d9b52de80b SHA512 7dda271baf0b6ba3576a59ec362b3dac15a5aba9e9b80fdba5ef9e6565608fb747a55ffe673cc9f53353a150e83379367098d9daf2bdacc7ec97c7c04e9c5a65 WHIRLPOOL 0d0d81403b065e8502509d182341fc8bd01e84bd8b50693fb2275ca36d6e4c4e273af3ca32bd90a09a3e789d95c831d4d2562482d0dce8469876eb43b0823d53
-MISC ChangeLog 56531 SHA256 230c798a017742a6eca47fddd7eadf65a4545615fdbc55a859ff23fe5e8afcff SHA512 90e74e445502236dee28f9992c8139c4766ba81d275497b8c9e5f3681fbef58d6caa8cdd8c8c168f7be63bd3c8cfcf39c91a182925dbef1fab34dcd4e74f9e46 WHIRLPOOL 263dfa50be1a4870e8405518da0a1e3425e465a261864759db9508dc1573b62ee3816ecbd9baf7b0d22e806039ac00618f5f1963f8d88bf40f363d9d95e4dddd
+EBUILD sbcl-1.2.7.ebuild 8338 SHA256 5fade7c611130e0313ab1402d10ae8775a43952b96744dfa622ffc2fc4786ebb SHA512 b18016c8931612d2dc84efd8b0ea637f8ec2a83e888abf3d323fcb40f6a7ea5da0964009f953932cf6f66a5d44235e2dc237853ec1c48d41a5632df280c62159 WHIRLPOOL 49ecaf3b026801873593ea38092d33b98caf08bf7f3db1693638b2af098b68ae1c2242e4aab6dc369541486157a905972348b4102477d829d608a7bd20fb7619
+MISC ChangeLog 56958 SHA256 42b7cf2957bcee1f8e50bd6beb233cc5a1bf3077ffc58160da5363258ea0ec44 SHA512 af99adee536d28fc5ac01ee3d7b8c5db319cf8f93db5756e7414edc5b38e94a1ba2606b3466634b7b4ab1a80eee87c2ddd2732515099a234b7bfe833c458e2d3 WHIRLPOOL a0da4525e595b1e584b130649b2ae16f186d965ba6523a176cd98c43af98f110a67de06a96ca622e0e0ed27536e61d6700a6364a5cc7e7895d348aa16f71a46c
 MISC metadata.xml 1676 SHA256 17fb0c325844368c649a311f15fbb53a87e5ef987021c52424ffa647745101f3 SHA512 54f12b8385602a6f26b35bb63cbfb0414788e899bc2f5240f60ce249d8ac914c1e236b8d66cee893eac1c3602661869a4333223fa4ce043bd284bde51fa99512 WHIRLPOOL 90a7306f698aa56ab618874f1d325bd3bb789961675d4b0728744abff152bfb6e8cb7303c3cc063782e0411ce27551527c313b404846dadbe2638c5ea086e2f1
+MISC sbcl-1.0.55-r1.ebuild.orig 6161 SHA256 764c48efc217326b8a9862bcc4589df7c2e1ba2b164937a6c008bf7850f383fd SHA512 ff9c03ce7aa6f523efd4e4b6b41639cdafc45fa242dfabe59ef8c5d428bb9a6025b44420663ea38fdfc110b2ff84a13bf5bfc62f8a6a4ad65b20e13ac4e92164 WHIRLPOOL 3585987db968443527fb6d31f71c110638855e19915679d7a89ce9024c21e1c400fc7e4b1de2ca67b9aaded423e6d0b6552c09b160c4d9bff7aa92606ced36bd
+MISC sbcl-1.0.55-r2.ebuild.orig 6230 SHA256 02574bec1fb07d17dd604daa7c4279a5125d0e9362247eaa2bde4ac55d0db607 SHA512 125165bf61e89a98f4796c792bc9c39dd8caa9595253bda3b2d50af762a5a597438966cbb5faa0d2e37563104b97185c88718be3d2df6a8fdb56af7bfe0d00c5 WHIRLPOOL 5f945702055282b0a989001f39b5ceb4de62ec750902018a3421562098298c405f23c855b2a00dd5a02b25aedfe3a92eab3de13a19de98670f15f2ebe6197a22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUrzbkAAoJEMcu9QQQ+wFr8cMQAJiglyTRQKGAsqJKa4ZTjN3Y
-rJB+vWI4aFK/ylGfXlyyJ9dvNohpB4TNal/0kk4OpdvoE7ygRgcXBPKG3MJYadl+
-PLB6pe6oWwoZoAry8E63RSO1WXdEcwIUyXL819RCEeoD/wBYhDawd9yePfkmMMY/
-OCsVYB+mGhBrX555+1bjxZVfkqOSPrt0j7T9eFsLMT50m5I5nCrXEq3NJPzTuj/b
-E1eUf+qQEDdaMi2VErWU6Mw1/XHhWH9Pwax+HyvCczJnvSXG0OUUANd2dF3TrAhU
-HisCge2Hyzu5pomcTtZ68nw1JlmxySWxb+iLLAGWdJ9TBqSfOrJqXLniI8VgYEzX
-9Kzgdjd+/5V+FnEDoIaYsWzzf1EHVJdVbtWblOMLoBgi/1sayqVsR7OFU7E71npu
-T5h348f9DLdVhfo9cZkVOgjfP7iaTElBrk4TKT7LOKtpdjfRNo973GnqMLbld2Y6
-laevctm7USxu4BbKvSsM3dumkuws28Lq1hvjRB07i+GKHlSfsN3492EfUSa2SAzA
-LT/HqpiQqPCsPR+ZqjpuHrFSSV7gtal8Ysur0V5D8a0Jz6UVxe0su27zNgA2EdLy
-TCRJDtALseRaI2XvwyABWReIvw2swrCTv6NuL61i28Q9/vWkp6s4qq89W8u5KgXF
-Rk5lYX9KNzhpxvS3483p
-=Ip6K
+iF4EAREIAAYFAlTMW4sACgkQoBEVQmGOlx9b3QD/Q7GovgYAZPF8LFaVAR79mPmx
+BljR2Qqly7EvFVSWfCABALcHhFaM7UHauRNzbPWkPNqrOeRgUB22PKRztIZCYK41
+=pKNT
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.7-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.7-verbose-build.patch
new file mode 100644
index 000000000000..60ead9f3e70a
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.2.7-verbose-build.patch
@@ -0,0 +1,28 @@
+--- sbcl-1.2.7-orig/make.sh	2015-01-01 06:09:07.000000000 +1100
++++ sbcl-1.2.7/make.sh	2015-01-31 13:06:09.652480932 +1100
+@@ -24,7 +24,7 @@
+ # thing" when run on the target machine, with the minor caveat that
+ # any --xc-host parameter should be suitable for the host machine
+ # instead of the target.
+-sh make-config.sh "$@" || exit $?
++sh -x make-config.sh "$@" || exit $?
+ 
+ . output/prefix.def
+ . output/build-config
+@@ -64,11 +64,11 @@
+ # Or, if you can set up the files somewhere shared (with NFS, AFS, or
+ # whatever) between the host machine and the target machine, the basic
+ # procedure above should still work, but you can skip the "copy" steps.
+-time sh make-host-1.sh
+-time sh make-target-1.sh
+-time sh make-host-2.sh
+-time sh make-target-2.sh
+-time sh make-target-contrib.sh
++time sh -x make-host-1.sh
++time sh -x make-target-1.sh
++time sh -x make-host-2.sh
++time sh -x make-target-2.sh
++time sh -x make-target-contrib.sh
+ 
+ NCONTRIBS=`find contrib -name Makefile -print | wc -l`
+ NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`
diff --git a/dev-lisp/sbcl/sbcl-1.2.7.ebuild b/dev-lisp/sbcl/sbcl-1.2.7.ebuild
index 4c21eadb47c4..921607182a9f 100644
--- a/dev-lisp/sbcl/sbcl-1.2.7.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.2.7.ebuild,v 1.2 2015/01/09 02:03:11 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.2.7.ebuild,v 1.3 2015/01/31 04:35:14 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -11,10 +11,13 @@ BV_AMD64=1.2.7
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
+BV_ARM=1.2.7
 BV_PPC_MACOS=1.0.47
 BV_X86_MACOS=1.1.6
 BV_X64_MACOS=1.1.8
+BV_SPARC_SOLARIS=1.0.23
 BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
 
 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
@@ -24,10 +27,13 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
 	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
 	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
 	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )"
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
@@ -94,6 +100,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/bsd-sockets-test-${PV}.patch
 
 	epatch "${FILESDIR}"/${PN}-1.0.6-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.2.7-verbose-build.patch
 
 	# To make the hardened compiler NOT compile with -fPIE -pie
 	if gcc-specs-pie ; then
@@ -101,6 +108,14 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
 	fi
 
+	# bug #526194
+	sed -e "s@CFLAGS =@CFLAGS = ${CFLAGS}@" \
+		-e "s@LINKFLAGS =@LINKFLAGS = ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
 	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
 
 	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk