[packages/sbcl] extract bootstrap bcond and allow building with system sbcl
atler
atler at pld-linux.org
Fri May 21 18:16:45 CEST 2021
commit 8e64e27ecb2335a201038e2610b375749b541ae1
Author: Jan Palus <atler at pld-linux.org>
Date: Thu May 20 19:21:11 2021 +0200
extract bootstrap bcond and allow building with system sbcl
sbcl.spec | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/sbcl.spec b/sbcl.spec
index 4c0cc4c..6af8a52 100644
--- a/sbcl.spec
+++ b/sbcl.spec
@@ -1,6 +1,7 @@
# NOTE: tests >100 processes, so ensure proper ulimit
#
# Conditional build:
+%bcond_with bootstrap # bootstrap build
%bcond_without doc # build without documentation
%bcond_with clisp # build using clisp instead of sbcl
%bcond_without cl_controller # common-lisp-controller support
@@ -38,6 +39,9 @@ Patch1: %{name}-threads.patch
Patch2: %{name}-info.patch
URL: http://sbcl.sourceforge.net/
%{?with_clisp:BuildRequires: clisp}
+%if %{without bootstrap} && %{without clisp}
+BuildRequires: sbcl
+%endif
%if %{with doc}
BuildRequires: tetex-dvips
BuildRequires: texinfo-texi2dvi
@@ -47,7 +51,7 @@ Requires(post,preun): common-lisp-controller
Requires: common-lisp-controller
%endif
%if %{without clisp}
-%{!?bootstrap_cl:ExclusiveArch: %{ix86} %{x8664}}
+%{?with_bootstrap:ExclusiveArch: %{ix86} %{x8664}}
# also: %{arm} aarch64 alpha mips mipsel ppc sparc
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,22 +100,28 @@ Documentation of Steel Bank Common Lisp (SBCL) in PDF format.
Dokumentacja Steel Bank Common Lisp (SBCL) w formacie PDF.
%prep
+%if %{with bootstrap}
%ifarch %{ix86}
%setup -q -a 10
%endif
%ifarch %{x8664}
%setup -q -a 11
%endif
+%else
+%setup -q
+%endif
%patch0 -p1
%ifarch %{ix86} %{x8664}
%patch1 -p1
%endif
%patch2 -p1
+%if %{with bootstrap}
mkdir sbcl-bootstrap
cd sbcl-*-linux
INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh ./install.sh
cd -
+%endif
# clean.sh is so stupid it removed sbcl-bootstrap contents
%{__mv} clean.sh clean.sh.orig
@@ -126,8 +136,10 @@ chmod 755 clean.sh
export GNUMAKE="make"
export CC="%{__cc}"
export CFLAGS="%{rpmcflags}"
+%if %{with bootstrap}
export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
+%endif
./make.sh \
--prefix=%{_prefix} \
%{?bootstrap_cl}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sbcl.git/commitdiff/fa2b18a0fff025da33710f2eb99d75186669af73
More information about the pld-cvs-commit
mailing list