summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lisp/sbcl/ChangeLog12
-rw-r--r--dev-lisp/sbcl/Manifest11
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.0.55-newglibc.patch43
-rw-r--r--dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild12
4 files changed, 70 insertions, 8 deletions
diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 27b606b5dd4e..717703b8b936 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,16 @@
# 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.215 2015/01/31 04:35:14 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.216 2015/02/01 01:46:12 gienah Exp $
+
+ 01 Feb 2015; Mark Wright <gienah@gentoo.org>
+ +files/sbcl-1.0.55-newglibc.patch, sbcl-1.0.55-r1.ebuild:
+ Fix Bug 463882 - dev-lisp/sbcl-1.0.55-r1 - x86-64-linux-os.c:93:1: error:
+ REG_RAX undeclared (first use in this function). Thanks to Bernardo Costa for
+ reporting, Coacher for supplying the pointer to the patch from upstream that
+ is applied to fix the problem, Juergen Rose and Guenther Brunthaler for
+ supplying build logs, Vasiliy, Nuno Silva, patrick, blueboar, jer, pchrist and
+ tomwij for helping. Apply fix for Bug 526194 - dev-lisp/sbcl-1.2.4 does not
+ respect CFLAGS and LDFLAGS to sbcl-1.0.55-r1
31 Jan 2015; Mark Wright <gienah@gentoo.org>
+files/sbcl-1.2.7-verbose-build.patch, sbcl-1.2.7.ebuild:
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 2db43f5e2005..964a694cee7c 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -11,6 +11,7 @@ AUX gentoo-fix_install_man.patch 399 SHA256 7e3e3f84be6d4dae51953825daaf26d8fe14
AUX gentoo-fix_linux-os-c.patch 418 SHA256 50b310b3d72b380b91828730a5539638decb6a4df6d28f93dff84ddad824b2ae SHA512 1c78d991c8685b8beeb41cfb3d79aafab4ffa08a36adba7741faefc1a66be3d5ab73efbce43d4d0424cdb86946997a945799fe42a4df44a9b8823a8b7d401f84 WHIRLPOOL a106afda17d6cf67a5c41a6f0b71e0bc44131eaaa5b07ba2d6afb332a8d70b4c5a0892f30904db7992732d1c560ade735bc8ab2572d3be5bffa91ee8c7633640
AUX gentoo-fix_nopie_for_hardened_toolchain.patch 1122 SHA256 80cdbc63648c2ea84bb4cd33815b7332bdca9a6101caab130705f0ef2bc078a4 SHA512 95dd9f7ccfc7ce274d84f71b1a2ab3ffb39dd5d8000ff52d9b154a0e5d7bb2cc7eea394c05adbcf050073becfe789d94abed72ce56bc494a64199e9e7cb9c7d1 WHIRLPOOL 45bb11865fbbd95f3fda806e339cf3097168732dcbc5e2f23770a49a8e7415a14262c1a9c217c4b431ffb247f74776956447d9494e2a7be35ca60928a788da99
AUX gentoo_fix_waitpid_c.patch 407 SHA256 6f0f2c40f0074f509a0f4cd38286896d6fb8f21eab296c7896d6162f20849f9a SHA512 7c049dabf8eeef335dbaead9e74a99f45824201c94b5f09e51b91f8927d444238232c896bff9de9f362e11e854e30ac30bb7c7552497251cd69c98b84479979d WHIRLPOOL 7b6fd6e45688697775defa9cc366f0195eec7de52405a726033bcb2f5e911600bd1c89d2edfffc2022d74252afc98a4f337b8576c812dd213e7dc81805a69e2a
+AUX sbcl-1.0.55-newglibc.patch 1372 SHA256 f5c268dd99aa56593a1d0ee68b3f4916b6b95bdb7ab3d9681e8c02a2c48a1412 SHA512 03b967e764cfa72e1784e4f6de5adf2aacb09dd1dcb340f75aa04d7cbf7c641bec5bb4e901dafb97e530de48604613f9cff2632cf0a282612b8df0b01e0c26ee WHIRLPOOL 74ac6bf4c1b740e1a21be6050826dfded896934f426c505361b83a0de5cd0797f4ff7d5d1609e998ea09e14d669ca1acadda1c91f9ebb3d3f64b75f917838210
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
@@ -41,20 +42,20 @@ DIST sbcl-1.2.7-x86-64-linux-binary.tar.bz2 10528686 SHA256 92094d7a5ea19891a624
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
+EBUILD sbcl-1.0.55-r1.ebuild 6376 SHA256 1a199d3b3ba3d64cd2c920f2a106b25eaf10df9cd3bf32e6e8087b2eb005d017 SHA512 ae2053590619769cfa08c5eb62bc08fd639246ed5df6ce9b916ddc536cce7d82b65b59a0d4607220d930aa049ba931c051f7e07358e1e0835f400b65187076a7 WHIRLPOOL 7d3d4acbfcc0be134d19d922ebeb4610d555c0153fd9363d135c08a591f599ec89b2b8aeabbb9845be8b42425b5d109151c14526525b78734159077ae7a56384
EBUILD sbcl-1.1.18.ebuild 6963 SHA256 b6977411bdadb9057d185ebea9a4ee5b2b7ff19d54c2ca838e3e9a0659412c89 SHA512 bbf22ab9402f65c92657c797c2820ea027d72bef71438c697cd949364421dc78be18687d1c0bb9bdf70538310e55f185fdc83fcbd4578f3832ee56c1253aea31 WHIRLPOOL cb4da2691ef3643a8c19fa357ea5fb52668c664a366f5e618bc7715b63cca41ca9e74bef0852d8a2e203a35b5079e58e0010bb3c87912e85fe0074792cc02028
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 8338 SHA256 5fade7c611130e0313ab1402d10ae8775a43952b96744dfa622ffc2fc4786ebb SHA512 b18016c8931612d2dc84efd8b0ea637f8ec2a83e888abf3d323fcb40f6a7ea5da0964009f953932cf6f66a5d44235e2dc237853ec1c48d41a5632df280c62159 WHIRLPOOL 49ecaf3b026801873593ea38092d33b98caf08bf7f3db1693638b2af098b68ae1c2242e4aab6dc369541486157a905972348b4102477d829d608a7bd20fb7619
-MISC ChangeLog 56958 SHA256 42b7cf2957bcee1f8e50bd6beb233cc5a1bf3077ffc58160da5363258ea0ec44 SHA512 af99adee536d28fc5ac01ee3d7b8c5db319cf8f93db5756e7414edc5b38e94a1ba2606b3466634b7b4ab1a80eee87c2ddd2732515099a234b7bfe833c458e2d3 WHIRLPOOL a0da4525e595b1e584b130649b2ae16f186d965ba6523a176cd98c43af98f110a67de06a96ca622e0e0ed27536e61d6700a6364a5cc7e7895d348aa16f71a46c
+MISC ChangeLog 57581 SHA256 a32536d0ec18b0bab4749c5a2d33b9ac5843cb720e0b5c4d593b86fade3dcaa0 SHA512 8421670ef3985a3fed42b880592f0aebd3f41279be53725a44533ca3887c5175696455af256978e8b0d846324fcb8cfb7679813819d8eb06d0d58f19296ac748 WHIRLPOOL 6af64c6b0f54fd7001a023c00d7918566cd4bb207a6594205f8607a39b45cc67d80a6473f2e32db71fe802f329dcd9a3bf050b71e4ed82e28c47d99d82dd94bc
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
-iF4EAREIAAYFAlTMW4sACgkQoBEVQmGOlx9b3QD/Q7GovgYAZPF8LFaVAR79mPmx
-BljR2Qqly7EvFVSWfCABALcHhFaM7UHauRNzbPWkPNqrOeRgUB22PKRztIZCYK41
-=pKNT
+iF4EAREIAAYFAlTNhW4ACgkQoBEVQmGOlx+rVAD/cGHG5cJ2GSYOZ+I3qgdA/RHT
+QDmUHFrsMETkEyPkdiAA/i1OLFaP0jHaZquXCi81ivuVHv3QzRnM3MGmtZB5eIsj
+=j8ud
-----END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/sbcl-1.0.55-newglibc.patch b/dev-lisp/sbcl/files/sbcl-1.0.55-newglibc.patch
new file mode 100644
index 000000000000..dbc94b06d4c9
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.0.55-newglibc.patch
@@ -0,0 +1,43 @@
+Fixes for glibc 2.17.
+
+linux-os.c is just a missing header (for personality()).
+
+In x86-64-linux-os.c, __USE_GNU is a glibc-internal name that features.h
+defines; _GNU_SOURCE is what it should actually be using to get GNU extensions.
+
+diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/linux-os.c work/sbcl-1.1.2/src/runtime/linux-os.c
+--- tmp/sbcl-1.1.2/src/runtime/linux-os.c 2012-12-01 11:32:38.000000000 +0000
++++ work/sbcl-1.1.2/src/runtime/linux-os.c 2012-12-31 01:20:37.619000000 +0000
+@@ -46,6 +46,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <linux/version.h>
++#include <sys/personality.h>
+
+ #include "validate.h"
+ #include "thread.h"
+diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c
+--- tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c 2012-12-01 11:32:38.000000000 +0000
++++ work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c 2012-12-31 01:20:25.450000000 +0000
+@@ -14,6 +14,9 @@
+ * files for more information.
+ */
+
++/* This is to get REG_RAX etc. from sys/ucontext.h. */
++#define _GNU_SOURCE
++
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <sys/param.h>
+@@ -21,11 +24,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <errno.h>
+-
+-#define __USE_GNU
+ #include <sys/ucontext.h>
+-#undef __USE_GNU
+-
+
+ #include "./signal.h"
+ #include "os.h"
diff --git a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
index 30d0727be403..9dc284731278 100644
--- a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.0.55-r1.ebuild,v 1.9 2014/08/05 12:47:08 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild,v 1.10 2015/02/01 01:46:12 gienah Exp $
EAPI=3
inherit multilib eutils flag-o-matic pax-utils
@@ -85,6 +85,14 @@ src_prepare() {
epatch "${FILESDIR}"/gentoo-fix_nopie_for_hardened_toolchain.patch
fi
+ # bug #463882, patch from upstream https://bugs.launchpad.net/sbcl/+bug/1095036
+ epatch "${FILESDIR}"/${P}-newglibc.patch
+
+ # bug #526194
+ sed -e "s@CFLAGS =@CFLAGS = ${CFLAGS}@" \
+ -e "s@LINKFLAGS =@LINKFLAGS = ${LDFLAGS}@" \
+ -i src/runtime/GNUmakefile || die
+
use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
# Some shells(such as dash) don't have "time" as builtin