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: Sat, 01 Oct 2022 10:20:23
Message-Id: 1664619604.d57dfaa4d8824baf5ec016900d4b3137b094948b.grozin@gentoo
1 commit: d57dfaa4d8824baf5ec016900d4b3137b094948b
2 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 1 10:20:04 2022 +0000
4 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 1 10:20:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dfaa4
7
8 dev-lisp/sbcl: bump to 2.2.9
9
10 Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
11
12 dev-lisp/sbcl/Manifest | 2 +
13 dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch | 30 ++++
14 dev-lisp/sbcl/sbcl-2.2.9.ebuild | 245 ++++++++++++++++++++++++++
15 3 files changed, 277 insertions(+)
16
17 diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
18 index 70071b788656..40bf28839341 100644
19 --- a/dev-lisp/sbcl/Manifest
20 +++ b/dev-lisp/sbcl/Manifest
21 @@ -20,3 +20,5 @@ DIST sbcl-2.2.6-source.tar.bz2 7128448 BLAKE2B 7b7c996c175e9a06ca3b1cc40834d8d97
22 DIST sbcl-2.2.6-x86-64-linux-binary.tar.bz2 11670931 BLAKE2B b878bed6f948dfdedb10a755887da386dbdf8b8c69d9a0051c7fd1bbba0cf30c87b7863f424cb744eb4d1d5482158f96cfb9000b84bbad208619fa875593c9b1 SHA512 22a14422dc5ec06501471b741ccca1d9a03f6061ccdb2175c75eb452cff3edf561e6804660ca179d269642e09854268fd4f158834c17e39ec95e568f26a2eeaa
23 DIST sbcl-2.2.8-source.tar.bz2 7263357 BLAKE2B fa8ba5664e22cb4856bf6e96d2d84e8a639eea0d9bb639cf049fd0d22260038b601eacfe9f5f84f8d38fb04af7e77a5733b122936833f77821d9321ddd2eb2b2 SHA512 2de8c096b964bfe2136ab30c3342fab154c1795e0ee1fc6ca2ae713da3c139ce066f37886e1f1b18d8e17ea4cbaf949e66960134505233ef9c7bb5bb902a6c52
24 DIST sbcl-2.2.8-x86-64-linux-binary.tar.bz2 11685573 BLAKE2B 3291840b2597ce37c70e8e894bf0c4dd9e1dcea619a18dee90e55b4a05dbe82267acdb289b20c3cb9be6987f551f28c410b6e03f58a9a0c01426eba1583107f0 SHA512 db1b81b603cdf6b76147d13502d3c152b8a78c2119b9df59a4e3705c93bc5ab208491a4ba19e28e31813e7da13d2d8d3a1a493dc86e143a5725bebffdc10e397
25 +DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065a6169d1560238dabbb4589831b2f094801b018d3b0bfc5e671328204ae34be763ec9df32ab7c5dcffd4860400582ae8 SHA512 6e215c7d34fe0db681b558206061f40bc1e235a0c2eb39518811bf2803e6a91f220b36e25da408a6756fd84071b6d634dc41e4acba73fdb0ffbab2cd77c9a8db
26 +DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400
27
28 diff --git a/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch
29 new file mode 100644
30 index 000000000000..f88f13301dfd
31 --- /dev/null
32 +++ b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch
33 @@ -0,0 +1,30 @@
34 +diff -r -U2 sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp
35 +--- sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp 2022-09-29 14:43:33.000000000 +0700
36 ++++ sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp 2022-10-01 16:32:39.919563905 +0700
37 +@@ -166,15 +166,15 @@
38 + #.sb-posix::einval)
39 +
40 +-(deftest rmdir.error.3
41 +- (handler-case
42 +- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
43 +- (sb-posix:syscall-error (c)
44 +- (typep
45 +- (sb-posix:syscall-errno c)
46 +- `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir
47 +- #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty
48 +- #+sunos ,sb-posix::einval
49 +- #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy))))
50 +- t)
51 ++; (deftest rmdir.error.3
52 ++; (handler-case
53 ++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
54 ++; (sb-posix:syscall-error (c)
55 ++; (typep
56 ++; (sb-posix:syscall-errno c)
57 ++; `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir
58 ++; #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty
59 ++; #+sunos ,sb-posix::einval
60 ++; #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy))))
61 ++; t)
62 +
63 + (deftest rmdir.error.4
64
65 diff --git a/dev-lisp/sbcl/sbcl-2.2.9.ebuild b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
66 new file mode 100644
67 index 000000000000..ccbdd2a533cf
68 --- /dev/null
69 +++ b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
70 @@ -0,0 +1,245 @@
71 +# Copyright 1999-2022 Gentoo Authors
72 +# Distributed under the terms of the GNU General Public License v2
73 +
74 +EAPI=8
75 +
76 +inherit flag-o-matic pax-utils toolchain-funcs
77 +
78 +#same order as http://www.sbcl.org/platform-table.html
79 +BV_X86=1.4.3
80 +BV_AMD64=2.2.9
81 +BV_PPC=1.2.7
82 +BV_PPC64LE=1.5.8
83 +BV_SPARC=1.0.28
84 +BV_ALPHA=1.0.28
85 +BV_ARM=1.4.11
86 +BV_ARM64=1.4.2
87 +BV_X64_MACOS=1.2.11
88 +BV_PPC_MACOS=1.0.47
89 +BV_X86_SOLARIS=1.2.7
90 +BV_X64_SOLARIS=1.2.7
91 +BV_SPARC_SOLARIS=1.0.23
92 +
93 +DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
94 +HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/"
95 +SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
96 + x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
97 + amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
98 + ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
99 + ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
100 + sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
101 + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
102 + arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
103 + arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
104 + x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
105 + ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
106 + x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
107 + x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
108 + sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
109 +
110 +LICENSE="MIT"
111 +SLOT="0/${PV}"
112 +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
113 +IUSE="capstone debug doc source +threads +unicode +zstd"
114 +
115 +CDEPEND=">=dev-lisp/asdf-3.3:=
116 + capstone? ( dev-libs/capstone:0/4 )"
117 +# bug #843851
118 +BDEPEND="${CDEPEND}
119 + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
120 +RDEPEND="${CDEPEND}
121 + zstd? ( app-arch/zstd )
122 + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
123 +
124 +# Disable warnings about executable stacks, as this won't be fixed soon by upstream
125 +QA_EXECSTACK="usr/bin/sbcl"
126 +
127 +CONFIG="${S}/customize-target-features.lisp"
128 +ENVD="${T}/50sbcl"
129 +
130 +# Prevent ASDF from using the system libraries
131 +CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
132 +ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
133 +
134 +usep() {
135 + use ${1} && echo "true" || echo "false"
136 +}
137 +
138 +sbcl_feature() {
139 + echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
140 +}
141 +
142 +sbcl_apply_features() {
143 + sed 's/^X//' > "${CONFIG}" <<-'EOF'
144 + (lambda (list)
145 + X (flet ((enable (x) (pushnew x list))
146 + X (disable (x) (setf list (remove x list))))
147 + EOF
148 + if use x86 || use amd64; then
149 + sbcl_feature "$(usep threads)" ":sb-thread"
150 + fi
151 + sbcl_feature "true" ":sb-ldb"
152 + sbcl_feature "false" ":sb-test"
153 + sbcl_feature "$(usep unicode)" ":sb-unicode"
154 + sbcl_feature "$(usep zstd)" ":sb-core-compression"
155 + sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
156 + sed 's/^X//' >> "${CONFIG}" <<-'EOF'
157 + X )
158 + X list)
159 + EOF
160 + cat "${CONFIG}"
161 +}
162 +
163 +src_unpack() {
164 + unpack ${A}
165 + mv sbcl-*-* sbcl-binary || die
166 + cd "${S}"
167 +}
168 +
169 +src_prepare() {
170 + # bug #468482
171 + eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
172 + # bugs #486552, #527666, #517004
173 + eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
174 + # bugs #560276, #561018
175 + eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch
176 + # bug #767742
177 + eapply "${FILESDIR}"/etags-2.1.0.patch
178 +
179 + eapply "${FILESDIR}"/verbose-build-2.0.3.patch
180 +
181 + eapply_user
182 +
183 + # Make sure the *FLAGS variables are sane.
184 + # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
185 + strip-unsupported-flags
186 + filter-flags -fomit-frame-pointer -Wl,-s
187 + filter-ldflags -s
188 +
189 + # original bugs #526194, #620532
190 + # this broke no-pie default builds, c.f. bug #632670
191 + # Pass CFLAGS down by appending our value, to let users override
192 + # the default values.
193 + # Keep passing LDFLAGS down via the LINKFLAGS variable.
194 + sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
195 + -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
196 + -i src/runtime/GNUmakefile || die
197 +
198 + sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
199 + -i make-config.sh || die
200 +
201 + # Use installed ASDF version
202 + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
203 + # Avoid installation of ASDF info page. See bug #605752
204 + sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
205 +
206 + use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
207 +
208 + # Some shells(such as dash) don't have "time" as builtin
209 + # and we don't want to DEPEND on sys-process/time
210 + sed "s,^time ,," -i make.sh || die
211 + sed "s,/lib,/$(get_libdir),g" -i install.sh || die
212 + # #define SBCL_HOME ...
213 + sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
214 + # change location of /etc/sbclrc ...
215 + sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
216 +
217 + use capstone || rm -rf contrib/sb-capstone
218 +
219 + find . -type f -name .cvsignore -delete
220 +}
221 +
222 +src_configure() {
223 + # customizing SBCL version as per
224 + # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
225 + echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
226 +
227 + # applying customizations
228 + sbcl_apply_features
229 +}
230 +
231 +src_compile() {
232 + local bindir="${WORKDIR}"/sbcl-binary
233 +
234 + # clear the environment to get rid of non-ASCII strings, see bug #174702
235 + # set HOME for paludis
236 + env - HOME="${T}" PATH="${PATH}" \
237 + CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
238 + CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
239 + GNUMAKE=make ./make.sh \
240 + "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
241 + || die "make failed"
242 +
243 + # need to set HOME because libpango(used by graphviz) complains about it
244 + if use doc; then
245 + env - HOME="${T}" PATH="${PATH}" \
246 + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
247 + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
248 + make -C doc/manual info html || die "Cannot build manual"
249 + env - HOME="${T}" PATH="${PATH}" \
250 + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
251 + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
252 + make -C doc/internals info html || die "Cannot build internal docs"
253 + fi
254 +}
255 +
256 +src_test() {
257 + ewarn "Unfortunately, it is known that some tests fail eg."
258 + ewarn "run-program.impure.lisp. This is an issue of the upstream's"
259 + ewarn "development and not of Gentoo's side. Please, before filing"
260 + ewarn "any bug(s) search for older submissions. Thank you."
261 + time ( cd tests && sh run-tests.sh )
262 +}
263 +
264 +src_install() {
265 + # install system-wide initfile
266 + dodir /etc/
267 + sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
268 + ;;; The following is required if you want source location functions to
269 + ;;; work in SLIME, for example.
270 + X
271 + (setf (logical-pathname-translations "SYS")
272 + X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
273 + X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
274 + X
275 + ;;; Setup ASDF2
276 + (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
277 + EOF
278 +
279 + # Install documentation
280 + unset SBCL_HOME
281 + INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
282 + sh install.sh || die "install.sh failed"
283 +
284 + # bug #517008
285 + pax-mark -mr "${D}"/usr/bin/sbcl
286 +
287 + # rm empty directories lest paludis complain about this
288 + find "${ED}" -empty -type d -exec rmdir -v {} +
289 +
290 + if use doc; then
291 + dodoc -r doc/internals/sbcl-internals
292 +
293 + doinfo doc/manual/*.info*
294 + doinfo doc/internals/sbcl-internals.info
295 +
296 + docinto internals-notes
297 + dodoc doc/internals-notes/*
298 + else
299 + rm -Rv "${ED}/usr/share/doc/${PF}" || die
300 + fi
301 +
302 + # install the SBCL source
303 + if use source; then
304 + ./clean.sh
305 + cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
306 + for d in contrib/*/; do
307 + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
308 + done
309 + fi
310 +
311 + # necessary for running newly-saved images
312 + echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
313 + echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
314 + doenvd "${ENVD}"
315 +}