Gentoo Archives: gentoo-commits

From: Andrey Grozin <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/, dev-lisp/sbcl/files/
Date: Thu, 02 Mar 2017 18:03:46
Message-Id: 1488477777.3a15cbb65de75bb54e8a2481833e79147379180a.grozin@gentoo
1 commit: 3a15cbb65de75bb54e8a2481833e79147379180a
2 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 2 18:02:57 2017 +0000
4 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 18:02:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a15cbb6
7
8 dev-lisp/sbcl: bump to 1.3.15
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-lisp/sbcl/Manifest | 2 +
13 dev-lisp/sbcl/files/concurrency-test-1.3.15.patch | 17 ++
14 ...5-gentoo-fix_nopie_for_hardened_toolchain.patch | 19 ++
15 dev-lisp/sbcl/sbcl-1.3.15.ebuild | 237 +++++++++++++++++++++
16 4 files changed, 275 insertions(+)
17
18 diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
19 index bb5a0d9438c..98e947df5a0 100644
20 --- a/dev-lisp/sbcl/Manifest
21 +++ b/dev-lisp/sbcl/Manifest
22 @@ -20,4 +20,6 @@ DIST sbcl-1.3.13-source.tar.bz2 5783599 SHA256 4c6935e4a9022637da95f2aab04d08326
23 DIST sbcl-1.3.13-x86-64-linux-binary.tar.bz2 9103731 SHA256 f92dbcb379f3a35ba13fd75a10912b767e5d8b2b10698413e5a217cea2f49cca SHA512 0e6302e408ea0b05f89c982a1660187cf2054cc65b464e340166c8fea962c4e52960f143cd2393491c60c83f5d90ff828a0807ee7f45bc1213ba5f13a6950c2b WHIRLPOOL 1e25fc22c6cf8725380cbe018d7a4a6875e457ec76428894f00568e8b9d3872ab4fdfee932d151efae5c726aca4161753131029347d5397e5f1dc9a4ea486e76
24 DIST sbcl-1.3.14-source.tar.bz2 5784135 SHA256 bf963d58533d839eb76a8028abd17071708d964d5dce07787839cfb6d0d6dcca SHA512 3bcfb27c75864290f47814cdac3c6d0ab7e88fce2fef11062f71993383470bd4f9bc2888314e016a80d3a629d748bf45358261fd320bf67ce55981b2fba42420 WHIRLPOOL 9f2c5460ea604d71eacb8f197782fc2bc9c8d2c974c8e0b06cca56078c2f83cf513c99a4a717d4856316aded939a05146a44a5bcf8d4c314ffdaa970cdc03c6d
25 DIST sbcl-1.3.14-x86-64-linux-binary.tar.bz2 9077586 SHA256 84dae89aa4741cac41e163fe9c85b9ab42ff8c2cbdcb31111d60e9019e2d4235 SHA512 0bff8737f389bf59f1fed2d76de32ce977da9c8c685c7f73280eef93428edcc48ca451adc26a305ea31f23507d7c45ffa5893aa4add2418048a1087fab686534 WHIRLPOOL 194a775092a4a035b65126ec6de63c981796e3618ca324d431fa544dbdbaaf3b790574d2e3c6813125ed55ace4b58be0727f2b6f4abffb686e3b773fdc8d3149
26 +DIST sbcl-1.3.15-source.tar.bz2 5798479 SHA256 b1b532d9df81b6a014dd6463f9129cd9470ba84db0952496970ac5b1e745ab85 SHA512 8dd9679bcaa244de0158051acae2ffcd1f79181a015a212f4416f3f6e439339d4d6ed5e03520b492fdd3302968eb1270be47729f3a016977bf951c5bcade0650 WHIRLPOOL 9fd1d8cbae29855becdef284d7b8ae0b619e27dc8fda8be8542225bbfc52daef64682c46fbf3bd0582289365ea6b96e3fd569f57be38d28dc021104bbc836e33
27 +DIST sbcl-1.3.15-x86-64-linux-binary.tar.bz2 10882518 SHA256 c7a9f143d539164abdf8771fbef071e5f1b26a5ecd496ddb4d778946faf758fe SHA512 28a2c17b366db2a2b2ac83a1ce3ac09583bb59aa2dbd992c02fef0870889a2d19cd1fdf633575a8fab674ea5a0058eafd2dfd6d8f7953237a33e7b12d60d20d5 WHIRLPOOL 1addc2c2517eaaa31ae2cd6b1adbf74f58c6afd7f4243ef4b2bb9b294ef448dda27695f6b6a758e6b7a9e2fb042c6f544c0625e597215cb5dcb1986d885e5d46
28 DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 SHA256 da2d296a8ab107a7b2e10831836648d882b01193f60269853932af4f63a06571 SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd WHIRLPOOL d2dde314d2b49e4246823032d953bbfe0858f7c69d0445da356426f9c5fac73036b32c1c048cf7f43615fa02707e8e434d8b085942e79d1e2b20f6fcb7e08919
29
30 diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
31 new file mode 100644
32 index 00000000000..53b5bea06bc
33 --- /dev/null
34 +++ b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
35 @@ -0,0 +1,17 @@
36 +diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp
37 +--- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2017-02-28 20:51:29.000000000 +0100
38 ++++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp 2017-03-02 18:15:41.225284441 +0100
39 +@@ -25,5 +25,5 @@
40 + (defun test-frlocks (&key (reader-count 100) (read-count 1000000)
41 + (outer-read-pause 0) (inner-read-pause 0)
42 +- (writer-count 10) (write-count (/ 1 *minimum-sleep*))
43 ++ (writer-count 10) (write-count 5000)
44 + (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
45 + (let ((rw (make-frlock))
46 +@@ -88,5 +88,5 @@
47 + (deftest* (frlock.1)
48 + (handler-case
49 +- (sb-ext:with-timeout 10
50 ++ (sb-ext:with-timeout 240
51 + (test-frlocks #+win32 :outer-write-pause #+win32 t ))
52 + (sb-ext:timeout (c)
53
54 diff --git a/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
55 new file mode 100644
56 index 00000000000..a3f93309750
57 --- /dev/null
58 +++ b/dev-lisp/sbcl/files/sbcl-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
59 @@ -0,0 +1,19 @@
60 +diff -U3 -r sbcl-1.3.15.orig/src/runtime/GNUmakefile sbcl-1.3.15/src/runtime/GNUmakefile
61 +--- sbcl-1.3.15.orig/src/runtime/GNUmakefile 2017-02-28 20:51:29.000000000 +0100
62 ++++ sbcl-1.3.15/src/runtime/GNUmakefile 2017-03-02 18:22:13.959257937 +0100
63 +@@ -46,13 +46,13 @@
64 + include Config
65 +
66 + # Disable PIE when possible
67 +-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
68 ++ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
69 + CFLAGS += -fno-pie
70 + LINKFLAGS += -no-pie
71 + LDFLAGS += -no-pie
72 + __LDFLAGS__ += -no-pie
73 + endif
74 +-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e nopie),)
75 ++ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
76 + CFLAGS += -fno-pie
77 + LINKFLAGS += -nopie
78 + LDFLAGS += -nopie
79
80 diff --git a/dev-lisp/sbcl/sbcl-1.3.15.ebuild b/dev-lisp/sbcl/sbcl-1.3.15.ebuild
81 new file mode 100644
82 index 00000000000..f1a0fb32ed5
83 --- /dev/null
84 +++ b/dev-lisp/sbcl/sbcl-1.3.15.ebuild
85 @@ -0,0 +1,237 @@
86 +# Copyright 1999-2017 Gentoo Foundation
87 +# Distributed under the terms of the GNU General Public License v2
88 +# $Id$
89 +
90 +EAPI=6
91 +inherit multilib eutils flag-o-matic pax-utils
92 +
93 +#same order as http://www.sbcl.org/platform-table.html
94 +BV_X86=1.2.7
95 +BV_AMD64=1.3.15
96 +BV_PPC=1.2.7
97 +BV_SPARC=1.0.28
98 +BV_ALPHA=1.0.28
99 +BV_ARM=1.3.12
100 +BV_ARM64=1.3.11
101 +BV_PPC_MACOS=1.0.47
102 +BV_X86_MACOS=1.1.6
103 +BV_X64_MACOS=1.2.11
104 +BV_SPARC_SOLARIS=1.0.23
105 +BV_X86_SOLARIS=1.2.7
106 +BV_X64_SOLARIS=1.2.7
107 +
108 +DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
109 +HOMEPAGE="http://sbcl.sourceforge.net/"
110 +SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
111 + x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
112 + amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
113 + ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
114 + sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
115 + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
116 + arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
117 + ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
118 + x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
119 + x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
120 + sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
121 + x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
122 + x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
123 +
124 +LICENSE="MIT"
125 +SLOT="0/${PV}"
126 +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
127 +IUSE="debug doc source +threads +unicode pax_kernel zlib"
128 +
129 +CDEPEND=">=dev-lisp/asdf-3.1:="
130 +DEPEND="${CDEPEND}
131 + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
132 + pax_kernel? ( sys-apps/elfix )"
133 +RDEPEND="${CDEPEND}
134 + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
135 +
136 +# Disable warnings about executable stacks, as this won't be fixed soon by upstream
137 +QA_EXECSTACK="usr/bin/sbcl"
138 +
139 +CONFIG="${S}/customize-target-features.lisp"
140 +ENVD="${T}/50sbcl"
141 +
142 +# Prevent ASDF from using the system libraries
143 +CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
144 +ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
145 +
146 +usep() {
147 + use ${1} && echo "true" || echo "false"
148 +}
149 +
150 +sbcl_feature() {
151 + echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
152 +}
153 +
154 +sbcl_apply_features() {
155 + sed 's/^X//' > "${CONFIG}" <<-'EOF'
156 + (lambda (list)
157 + X (flet ((enable (x) (pushnew x list))
158 + X (disable (x) (setf list (remove x list))))
159 + EOF
160 + if use x86 || use amd64; then
161 + sbcl_feature "$(usep threads)" ":sb-thread"
162 + fi
163 + sbcl_feature "true" ":sb-ldb"
164 + sbcl_feature "false" ":sb-test"
165 + sbcl_feature "$(usep unicode)" ":sb-unicode"
166 + sbcl_feature "$(usep zlib)" ":sb-core-compression"
167 + sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
168 + sed 's/^X//' >> "${CONFIG}" <<-'EOF'
169 + X )
170 + X list)
171 + EOF
172 + cat "${CONFIG}"
173 +}
174 +
175 +src_unpack() {
176 + unpack ${A}
177 + mv sbcl-*-* sbcl-binary || die
178 + cd "${S}"
179 +}
180 +
181 +src_prepare() {
182 + eapply "${FILESDIR}"/gentoo-fix_install_man.patch
183 + # bug #468482
184 + eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
185 + # bugs #486552, #527666, #517004
186 + eapply "${FILESDIR}"/bsd-sockets-test-1.3.12.patch
187 + # bugs #560276, #561018
188 + eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
189 + # bug #599902, #607302, #583930
190 + eapply "${FILESDIR}"/${PN}-1.3.15-gentoo-fix_nopie_for_hardened_toolchain.patch
191 +
192 + eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
193 + eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
194 +
195 + eapply_user
196 +
197 + # bug #526194
198 + sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
199 + -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
200 + -i src/runtime/GNUmakefile || die
201 +
202 + sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
203 + -i make-config.sh || die
204 +
205 + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
206 +
207 + use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
208 +
209 + # Some shells(such as dash) don't have "time" as builtin
210 + # and we don't want to DEPEND on sys-process/time
211 + sed "s,^time ,," -i make.sh || die
212 + sed "s,/lib,/$(get_libdir),g" -i install.sh || die
213 + # #define SBCL_HOME ...
214 + sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
215 + # change location of /etc/sbclrc ...
216 + sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
217 +
218 + find . -type f -name .cvsignore -delete
219 +}
220 +
221 +src_configure() {
222 + # customizing SBCL version as per
223 + # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
224 + echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
225 +
226 + # applying customizations
227 + sbcl_apply_features
228 +}
229 +
230 +src_compile() {
231 + local bindir="${WORKDIR}"/sbcl-binary
232 +
233 + strip-unsupported-flags ; filter-flags -fomit-frame-pointer
234 +
235 + if use pax_kernel ; then
236 + # To disable PaX on hardened systems
237 + pax-mark -mr "${bindir}"/src/runtime/sbcl
238 +
239 + # Hack to disable PaX on second GENESIS stage
240 + sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \
241 + "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
242 + fi
243 +
244 + # clear the environment to get rid of non-ASCII strings, see bug 174702
245 + # set HOME for paludis
246 + env - HOME="${T}" PATH="${PATH}" \
247 + CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
248 + CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
249 + GNUMAKE=make ./make.sh \
250 + "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
251 + || die "make failed"
252 +
253 + # need to set HOME because libpango(used by graphviz) complains about it
254 + if use doc; then
255 + env - HOME="${T}" PATH="${PATH}" \
256 + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
257 + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
258 + make -C doc/manual info html || die "Cannot build manual"
259 + env - HOME="${T}" PATH="${PATH}" \
260 + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
261 + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
262 + make -C doc/internals info html || die "Cannot build internal docs"
263 + fi
264 +}
265 +
266 +src_test() {
267 + ewarn "Unfortunately, it is known that some tests fail eg."
268 + ewarn "run-program.impure.lisp. This is an issue of the upstream's"
269 + ewarn "development and not of Gentoo's side. Please, before filing"
270 + ewarn "any bug(s) search for older submissions. Thank you."
271 + time ( cd tests && sh run-tests.sh )
272 +}
273 +
274 +src_install() {
275 + # install system-wide initfile
276 + dodir /etc/
277 + sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
278 + ;;; The following is required if you want source location functions to
279 + ;;; work in SLIME, for example.
280 + X
281 + (setf (logical-pathname-translations "SYS")
282 + X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
283 + X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
284 + X
285 + ;;; Setup ASDF2
286 + (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
287 + EOF
288 +
289 + # Install documentation
290 + unset SBCL_HOME
291 + INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
292 + sh install.sh || die "install.sh failed"
293 +
294 + # bug #517008
295 + pax-mark -mr "${D}"/usr/bin/sbcl
296 +
297 + # rm empty directories lest paludis complain about this
298 + find "${ED}" -empty -type d -exec rmdir -v {} +
299 +
300 + if use doc; then
301 + dodoc -r doc/internals/sbcl-internals
302 +
303 + doinfo doc/manual/*.info*
304 + doinfo doc/internals/sbcl-internals.info
305 +
306 + docinto internals-notes
307 + dodoc doc/internals-notes/*
308 + else
309 + rm -Rv "${ED}/usr/share/doc/${PF}" || die
310 + fi
311 +
312 + # install the SBCL source
313 + if use source; then
314 + ./clean.sh
315 + cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
316 + fi
317 +
318 + # necessary for running newly-saved images
319 + echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
320 + echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
321 + doenvd "${ENVD}"
322 +}