Merge pull request #1306 from cstrouse/fix-clisp

Fix conflicting configure options

packages/clisp.rb

@@ -3,38 +3,38 @@ require 'package'
 class Clisp < Package
   description 'ANSI Common Lisp compiler, interpreter and debugger.'
   homepage 'http://www.gnu.org/software/clisp/'
-  version '2.49-2'
+  version '2.49-3'
   source_url 'ftp://ftp.gnu.org/pub/gnu/clisp/release/2.49/clisp-2.49.tar.bz2'
   source_sha256 '8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890'
 
   binary_url ({
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/clisp-2.49-2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/clisp-2.49-2-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-       i686: '9255cf8cb4acf3e0d8c4dd889194937b1dc736063c82382cb64156ea1f746ff2',
-     x86_64: '68f7807ca4ccb4a3c584657100b8da214f02f9ef3c295295f69dacab6fd0bb87',
   })
 
-  depends_on 'libsigsegv'
-  depends_on 'ffcall'
   depends_on 'diffutils' => :build
+  depends_on 'ffcall'
+  depends_on 'libsigsegv'
+  depends_on 'readline'
 
   def self.build
-    system "./configure", "--disable-static", "--enable-static", "--with-pic"
+    system './configure',
+      "--prefix=#{CREW_PREFIX}",
+      "--libdir=#{CREW_LIB_PREFIX}",
+      '--disable-static',
+      '--with-pic',
+      '--with-ffcall',
+      '--with-readline'
     FileUtils.cd('src') do
-      # disable unavailable "-R" option
-      # modifying configure options doesn't work for this
-      system "sed", "-i", "Makefile", "-e", "s:-R/usr/local/lib ::"
-
-      # force to compile in sequential since clisp Makefile doesn't work in parallel
-      system "make", "-j1"
+      # disable unavailable "-R" option, modifying configure options doesn't work
+      system 'sed', '-i', 'Makefile', '-e', "s:-R#{CREW_LIB_PREFIX} ::"
+      system 'make', '-j1' # parallel builds fail
     end
   end
 
   def self.install
     FileUtils.cd('src') do
-      system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+      system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
     end
   end
 end