| 1 |
commit: bda3d776acdd87b0d12b3fdeb8c3f4b46e326d20 |
| 2 |
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 1 11:19:11 2019 +0000 |
| 4 |
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 1 11:19:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda3d776 |
| 7 |
|
| 8 |
dev-lisp/sbcl: bump to 1.5.3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
| 11 |
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lisp/sbcl/Manifest | 2 + |
| 14 |
dev-lisp/sbcl/files/concurrency-test-1.5.3.patch | 17 ++ |
| 15 |
dev-lisp/sbcl/sbcl-1.5.3.ebuild | 246 +++++++++++++++++++++++ |
| 16 |
3 files changed, 265 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest |
| 19 |
index ad1f9145451..246e50c00ca 100644 |
| 20 |
--- a/dev-lisp/sbcl/Manifest |
| 21 |
+++ b/dev-lisp/sbcl/Manifest |
| 22 |
@@ -21,3 +21,5 @@ DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed |
| 23 |
DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236 |
| 24 |
DIST sbcl-1.5.0-source.tar.bz2 6257355 BLAKE2B bbdca91c5baa28e4522bf37be041a2f7e8237d15c700f49960516e578ee7509fa3959022df3a7c3a4125bc2893f99d0a839a02ad484d5061cccffe900a078baf SHA512 c09fb26ec7abdb5275165806c61000bc258281d9e745eafe67ac5a6542fcca2741395de5f39aebaf140d2ec9a58327e883fee8a6c4f320f4cbbd204806b7b5c7 |
| 25 |
DIST sbcl-1.5.0-x86-64-linux-binary.tar.bz2 10487197 BLAKE2B 48e87b24ef0681cbeb9306c8b28516d312c076ae9c2cc0f6e9c0100a24a445b0884ce23e06868783b9166dcd89bf2d0b0670b375967beb2fcbd4d2a203db428c SHA512 072fee950131d0327a6d44a2c808a03eda6a4ab36b8ed1ef9b9ca48662fe11ea62662b007d5e579d06b84424db8db682d831013f68fe028111d32085187160c1 |
| 26 |
+DIST sbcl-1.5.3-source.tar.bz2 6343923 BLAKE2B c7b04fbba5563270037d3abcc3c4a2def210721cf7fcf8da9a3133f8079fb4a512b01f32c47d22c9abce27f917350ef9cbaacd897a32a30c5f74ee55db91191e SHA512 022af0fa74701c530d98816b0696f5db4e8fc9a47b10fad17952239f77f160a1bc6791bf2f18e02ddbe249ab379d458ee8cee817f66dbc26dcbbcc855cd3ee21 |
| 27 |
+DIST sbcl-1.5.3-x86-64-linux-binary.tar.bz2 9920503 BLAKE2B e22750a5258c6a31378487ed20410d689c05792f906d37d73501ccbeac236f1296479ca2dec2d1ad40e38a00a3e3f3ff27a352e96932d89a76b426734bca0213 SHA512 9ff183529cfeec6ab7a1b5fb9f727463ad497333d1f6a75d1501c251d19e0510490743ddd8a3075d73854160fa5c07ce9b6e29011c6991a7851ba35593b0c735 |
| 28 |
|
| 29 |
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch b/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..8c2e89fccfc |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch |
| 34 |
@@ -0,0 +1,17 @@ |
| 35 |
+diff -r -U2 sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp |
| 36 |
+--- sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2019-05-27 22:03:04.000000000 +0200 |
| 37 |
++++ sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp 2019-06-01 11:41:21.260384857 +0200 |
| 38 |
+@@ -26,5 +26,5 @@ |
| 39 |
+ (read-count 1000000) |
| 40 |
+ (outer-read-pause 0) (inner-read-pause 0) |
| 41 |
+- (writer-count 10) (write-count (/ 1 *minimum-sleep*)) |
| 42 |
++ (writer-count 10) (write-count 5000) |
| 43 |
+ (outer-write-pause *minimum-sleep*) (inner-write-pause 0)) |
| 44 |
+ (let ((rw (make-frlock)) |
| 45 |
+@@ -89,5 +89,5 @@ |
| 46 |
+ (deftest* (frlock.1) |
| 47 |
+ (handler-case |
| 48 |
+- (sb-ext:with-timeout 20 |
| 49 |
++ (sb-ext:with-timeout 240 |
| 50 |
+ (test-frlocks #+win32 :outer-write-pause #+win32 t )) |
| 51 |
+ (sb-ext:timeout (c) |
| 52 |
|
| 53 |
diff --git a/dev-lisp/sbcl/sbcl-1.5.3.ebuild b/dev-lisp/sbcl/sbcl-1.5.3.ebuild |
| 54 |
new file mode 100644 |
| 55 |
index 00000000000..35e36b9e41a |
| 56 |
--- /dev/null |
| 57 |
+++ b/dev-lisp/sbcl/sbcl-1.5.3.ebuild |
| 58 |
@@ -0,0 +1,246 @@ |
| 59 |
+# Copyright 1999-2019 Gentoo Authors |
| 60 |
+# Distributed under the terms of the GNU General Public License v2 |
| 61 |
+ |
| 62 |
+EAPI=6 |
| 63 |
+ |
| 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.4.3 |
| 68 |
+BV_AMD64=1.5.3 |
| 69 |
+BV_PPC=1.2.7 |
| 70 |
+BV_SPARC=1.0.28 |
| 71 |
+BV_ALPHA=1.0.28 |
| 72 |
+BV_ARM=1.4.11 |
| 73 |
+BV_ARM64=1.4.2 |
| 74 |
+BV_X86_MACOS=1.1.6 |
| 75 |
+BV_X64_MACOS=1.2.11 |
| 76 |
+BV_PPC_MACOS=1.0.47 |
| 77 |
+BV_X86_SOLARIS=1.2.7 |
| 78 |
+BV_X64_SOLARIS=1.2.7 |
| 79 |
+BV_SPARC_SOLARIS=1.0.23 |
| 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 |
+ arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-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 |
+ ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-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 |
+ sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" |
| 97 |
+ |
| 98 |
+LICENSE="MIT" |
| 99 |
+SLOT="0/${PV}" |
| 100 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" |
| 101 |
+IUSE="debug doc source +threads +unicode pax_kernel zlib" |
| 102 |
+ |
| 103 |
+CDEPEND=">=dev-lisp/asdf-3.1:=" |
| 104 |
+DEPEND="${CDEPEND} |
| 105 |
+ doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) |
| 106 |
+ pax_kernel? ( sys-apps/elfix )" |
| 107 |
+RDEPEND="${CDEPEND} |
| 108 |
+ !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" |
| 109 |
+ |
| 110 |
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream |
| 111 |
+QA_EXECSTACK="usr/bin/sbcl" |
| 112 |
+ |
| 113 |
+CONFIG="${S}/customize-target-features.lisp" |
| 114 |
+ENVD="${T}/50sbcl" |
| 115 |
+ |
| 116 |
+# Prevent ASDF from using the system libraries |
| 117 |
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" |
| 118 |
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" |
| 119 |
+ |
| 120 |
+usep() { |
| 121 |
+ use ${1} && echo "true" || echo "false" |
| 122 |
+} |
| 123 |
+ |
| 124 |
+sbcl_feature() { |
| 125 |
+ echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" |
| 126 |
+} |
| 127 |
+ |
| 128 |
+sbcl_apply_features() { |
| 129 |
+ sed 's/^X//' > "${CONFIG}" <<-'EOF' |
| 130 |
+ (lambda (list) |
| 131 |
+ X (flet ((enable (x) (pushnew x list)) |
| 132 |
+ X (disable (x) (setf list (remove x list)))) |
| 133 |
+ EOF |
| 134 |
+ if use x86 || use amd64; then |
| 135 |
+ sbcl_feature "$(usep threads)" ":sb-thread" |
| 136 |
+ fi |
| 137 |
+ sbcl_feature "true" ":sb-ldb" |
| 138 |
+ sbcl_feature "false" ":sb-test" |
| 139 |
+ sbcl_feature "$(usep unicode)" ":sb-unicode" |
| 140 |
+ sbcl_feature "$(usep zlib)" ":sb-core-compression" |
| 141 |
+ sbcl_feature "$(usep debug)" ":sb-xref-for-internals" |
| 142 |
+ sed 's/^X//' >> "${CONFIG}" <<-'EOF' |
| 143 |
+ X ) |
| 144 |
+ X list) |
| 145 |
+ EOF |
| 146 |
+ cat "${CONFIG}" |
| 147 |
+} |
| 148 |
+ |
| 149 |
+src_unpack() { |
| 150 |
+ unpack ${A} |
| 151 |
+ mv sbcl-*-* sbcl-binary || die |
| 152 |
+ cd "${S}" |
| 153 |
+} |
| 154 |
+ |
| 155 |
+src_prepare() { |
| 156 |
+ # bug #468482 |
| 157 |
+ eapply "${FILESDIR}"/concurrency-test-1.5.3.patch |
| 158 |
+ # bugs #486552, #527666, #517004 |
| 159 |
+ eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.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.4.0-verbose-build.patch |
| 165 |
+ |
| 166 |
+ eapply_user |
| 167 |
+ |
| 168 |
+ # Make sure the *FLAGS variables are sane. |
| 169 |
+ # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. |
| 170 |
+ strip-unsupported-flags |
| 171 |
+ filter-flags -fomit-frame-pointer -Wl,-s |
| 172 |
+ filter-ldflags -s |
| 173 |
+ |
| 174 |
+ # original bugs #526194, #620532 |
| 175 |
+ # this broke no-pie default builds, c.f. bug #632670 |
| 176 |
+ # Pass CFLAGS down by appending our value, to let users override |
| 177 |
+ # the default values. |
| 178 |
+ # Keep passing LDFLAGS down via the LINKFLAGS variable. |
| 179 |
+ sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ |
| 180 |
+ -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ |
| 181 |
+ -i src/runtime/GNUmakefile || die |
| 182 |
+ |
| 183 |
+ sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ |
| 184 |
+ -i make-config.sh || die |
| 185 |
+ |
| 186 |
+ # Use installed ASDF version |
| 187 |
+ cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die |
| 188 |
+ # Avoid installation of ASDF info page. See bug #605752 |
| 189 |
+ sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die |
| 190 |
+ |
| 191 |
+ use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk |
| 192 |
+ |
| 193 |
+ # Some shells(such as dash) don't have "time" as builtin |
| 194 |
+ # and we don't want to DEPEND on sys-process/time |
| 195 |
+ sed "s,^time ,," -i make.sh || die |
| 196 |
+ sed "s,/lib,/$(get_libdir),g" -i install.sh || die |
| 197 |
+ # #define SBCL_HOME ... |
| 198 |
+ sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die |
| 199 |
+ # change location of /etc/sbclrc ... |
| 200 |
+ sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die |
| 201 |
+ |
| 202 |
+ find . -type f -name .cvsignore -delete |
| 203 |
+} |
| 204 |
+ |
| 205 |
+src_configure() { |
| 206 |
+ # customizing SBCL version as per |
| 207 |
+ # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup |
| 208 |
+ echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr |
| 209 |
+ |
| 210 |
+ # applying customizations |
| 211 |
+ sbcl_apply_features |
| 212 |
+} |
| 213 |
+ |
| 214 |
+src_compile() { |
| 215 |
+ local bindir="${WORKDIR}"/sbcl-binary |
| 216 |
+ |
| 217 |
+ if use pax_kernel ; then |
| 218 |
+ # To disable PaX on hardened systems |
| 219 |
+ pax-mark -mr "${bindir}"/src/runtime/sbcl |
| 220 |
+ |
| 221 |
+ # Hack to disable PaX on second GENESIS stage |
| 222 |
+ sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ |
| 223 |
+ "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" |
| 224 |
+ fi |
| 225 |
+ |
| 226 |
+ # clear the environment to get rid of non-ASCII strings, see bug #174702 |
| 227 |
+ # set HOME for paludis |
| 228 |
+ env - HOME="${T}" PATH="${PATH}" \ |
| 229 |
+ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ |
| 230 |
+ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ |
| 231 |
+ GNUMAKE=make ./make.sh \ |
| 232 |
+ "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ |
| 233 |
+ || die "make failed" |
| 234 |
+ |
| 235 |
+ # need to set HOME because libpango(used by graphviz) complains about it |
| 236 |
+ if use doc; then |
| 237 |
+ env - HOME="${T}" PATH="${PATH}" \ |
| 238 |
+ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ |
| 239 |
+ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ |
| 240 |
+ make -C doc/manual info html || die "Cannot build manual" |
| 241 |
+ env - HOME="${T}" PATH="${PATH}" \ |
| 242 |
+ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ |
| 243 |
+ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ |
| 244 |
+ make -C doc/internals info html || die "Cannot build internal docs" |
| 245 |
+ fi |
| 246 |
+} |
| 247 |
+ |
| 248 |
+src_test() { |
| 249 |
+ ewarn "Unfortunately, it is known that some tests fail eg." |
| 250 |
+ ewarn "run-program.impure.lisp. This is an issue of the upstream's" |
| 251 |
+ ewarn "development and not of Gentoo's side. Please, before filing" |
| 252 |
+ ewarn "any bug(s) search for older submissions. Thank you." |
| 253 |
+ time ( cd tests && sh run-tests.sh ) |
| 254 |
+} |
| 255 |
+ |
| 256 |
+src_install() { |
| 257 |
+ # install system-wide initfile |
| 258 |
+ dodir /etc/ |
| 259 |
+ sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF |
| 260 |
+ ;;; The following is required if you want source location functions to |
| 261 |
+ ;;; work in SLIME, for example. |
| 262 |
+ X |
| 263 |
+ (setf (logical-pathname-translations "SYS") |
| 264 |
+ X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") |
| 265 |
+ X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) |
| 266 |
+ X |
| 267 |
+ ;;; Setup ASDF2 |
| 268 |
+ (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") |
| 269 |
+ EOF |
| 270 |
+ |
| 271 |
+ # Install documentation |
| 272 |
+ unset SBCL_HOME |
| 273 |
+ INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ |
| 274 |
+ sh install.sh || die "install.sh failed" |
| 275 |
+ |
| 276 |
+ # bug #517008 |
| 277 |
+ pax-mark -mr "${D}"/usr/bin/sbcl |
| 278 |
+ |
| 279 |
+ # rm empty directories lest paludis complain about this |
| 280 |
+ find "${ED}" -empty -type d -exec rmdir -v {} + |
| 281 |
+ |
| 282 |
+ if use doc; then |
| 283 |
+ dodoc -r doc/internals/sbcl-internals |
| 284 |
+ |
| 285 |
+ doinfo doc/manual/*.info* |
| 286 |
+ doinfo doc/internals/sbcl-internals.info |
| 287 |
+ |
| 288 |
+ docinto internals-notes |
| 289 |
+ dodoc doc/internals-notes/* |
| 290 |
+ else |
| 291 |
+ rm -Rv "${ED}/usr/share/doc/${PF}" || die |
| 292 |
+ fi |
| 293 |
+ |
| 294 |
+ # install the SBCL source |
| 295 |
+ if use source; then |
| 296 |
+ ./clean.sh |
| 297 |
+ cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die |
| 298 |
+ fi |
| 299 |
+ |
| 300 |
+ # necessary for running newly-saved images |
| 301 |
+ echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" |
| 302 |
+ echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" |
| 303 |
+ doenvd "${ENVD}" |
| 304 |
+} |
Archives