diff options
| author | Sidney Markowitz | 2014-02-20 12:35:37 +1300 |
|---|---|---|
| committer | Adam Vandenberg | 2014-02-20 22:02:29 -0800 |
| commit | 1c36c758175ddcfb0540cbc064c88e66751ff54f (patch) | |
| tree | d1673285092e4cfff3031e4d93027066a31a8e1d /Library | |
| parent | 1fb5ddac239b50684bf060cc3a77dd0023a87d31 (diff) | |
| download | homebrew-1c36c758175ddcfb0540cbc064c88e66751ff54f.tar.bz2 | |
sbcl: 32-bit install must get 32-bit bootstrap
Add a resource for downloading the current 32-bit binary
build to use as the bootstrap when installing 32-bit.
Without this sbcl cannot be installed on a 32-bit machine.
With this commit installing on x86_64 machine using the
32-bit option will bootstrap from the 32-bit binary.
Bootstrap to 32-bit from the 64-bit should work, as any boostrap
that can run should produce the same result, but this ensures
at install time that the machine can run the 32-bit version.
Updated the version of the 64-bit bootstrap file
from 1.1.0 to 1.1.8 and added a comment on where to find
documented the list of latest binary versions.
Closes #26850.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/sbcl.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Library/Formula/sbcl.rb b/Library/Formula/sbcl.rb index c78c900b9..b7b2c4328 100644 --- a/Library/Formula/sbcl.rb +++ b/Library/Formula/sbcl.rb @@ -23,9 +23,16 @@ class Sbcl < Formula option "with-ldb", "Include low-level debugger in the build" option "with-internal-xref", "Include XREF information for SBCL internals (increases core size by 5-6MB)" - resource 'bootstrap' do - url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-x86-64-darwin-binary.tar.bz2' - sha1 'ed2069e124027c43926728c48d604efbb4e33950' + # Current binary versions are listed at http://sbcl.sourceforge.net/platform-table.html + + resource 'bootstrap64' do + url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2' + sha1 'cffd8c568588f48bd0c69295a385b662d27983cf' + end + + resource 'bootstrap32' do + url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.6/sbcl-1.1.6-x86-darwin-binary.tar.bz2' + sha1 '35a76b93f8714bc34ba127df4aaf69aacfc08164' end def patches @@ -61,7 +68,8 @@ class Sbcl < Formula value =~ /[\x80-\xff]/n end - resource('bootstrap').stage do + bootstrap = (build.build_32_bit? || !MacOS.prefer_64_bit?) ? 'bootstrap32' : 'bootstrap64' + resource(bootstrap).stage do # We only need the binaries for bootstrapping, so don't install anything: command = Dir.pwd + "/src/runtime/sbcl" core = Dir.pwd + "/output/sbcl.core" |