SBCL 1.0.46

Allow SBCL to be built with or without support for native OS
threads. The default is to build with threads included. The command
line option --without-threads disables them.

Also, add two other options for useful things that can be included in
the build:

 * --with-ldb builds with the low-level debugger (invoked when SBCL
   crashes hard)

 * --with-internals-xref includes XREF information for internal
   functions. This increases the size of the core file by 5-6 MB, but
   is useful if you want to figure out how SBCL works.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

Formula/sbcl.rb

@@ -1,5 +1,4 @@
 require 'formula'
-require 'hardware'
 
 class SbclBootstrapBinaries < Formula
   url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.30/sbcl-1.0.30-x86-darwin-binary.tar.bz2'
@@ -7,33 +6,45 @@ class SbclBootstrapBinaries < Formula
   version "1.0.30"
 end
 
-
 class Sbcl < Formula
   homepage 'http://www.sbcl.org/'
+  url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.46/sbcl-1.0.46-source.tar.bz2'
+  md5 '83f094aa36edce2d69214330890f05e5'
+  version '1.0.46'
   head 'git://sbcl.boinkor.net/sbcl.git'
 
-  url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2'
-  md5 'b80e491b8e9228bbfa4fe679fd608697'
-  version '1.0.45'
-
   skip_clean 'bin'
   skip_clean 'lib'
 
-  def patches
-    base = "http://svn.macports.org/repository/macports/trunk/dports/lang/sbcl/files"
-    { :p0 => ["patch-base-target-features.diff",
-              "patch-make-doc.diff",
-              "patch-posix-tests.diff",
-              "patch-use-mach-exception-handler.diff"].map { |file_name| "#{base}/#{file_name}" }
-    }
+  def options
+    [
+      ["--without-threads",  "Build SBCL without support for native threads"],
+      ["--with-ldb",  "Include low-level debugger in the build"],
+      ["--with-internal-xref",  "Include XREF information for SBCL internals (increases core size by 5-6MB)"]
+    ]
+  end
+
+  def write_features
+    features = []
+    features << ":sb-thread" unless ARGV.include? "--without-threads"
+    features << ":sb-ldb" if ARGV.include? "--with-ldb"
+    features << ":sb-xref-for-internals" if ARGV.include? "--with-internal-xref"
+
+    File.open("customize-target-features.lisp", "w") do |file|
+      file.puts "(lambda (list)"
+      features.each do |f|
+        file.puts "  (pushnew #{f} list)"
+      end
+      file.puts "  list)"
+    end
   end
 
   def install
+    write_features
+
     build_directory = Dir.pwd
     SbclBootstrapBinaries.new.brew {
-      # We only need the binaries for bootstrapping, so don't install
-      # anything:
-
+      # We only need the binaries for bootstrapping, so don't install anything:
       command = Dir.pwd + "/src/runtime/sbcl"
       core = Dir.pwd + "/output/sbcl.core"
       xc_cmdline = "#{command} --core #{core} --disable-debugger --no-userinit --no-sysinit"
@@ -41,6 +52,7 @@ class Sbcl < Formula
       Dir.chdir(build_directory)
       system "./make.sh --prefix='#{prefix}' --xc-host='#{xc_cmdline}'"
     }
+
     ENV['INSTALL_ROOT'] = prefix
     system "sh install.sh"
   end