Gentoo Archives: gentoo-commits

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