parent
a07ee99379
commit
990cdec9d8
1 changed files with 5 additions and 34 deletions
|
@ -1,13 +1,11 @@
|
|||
require 'formula'
|
||||
require "formula"
|
||||
|
||||
class ObjectiveCaml < Formula
|
||||
homepage 'http://ocaml.org'
|
||||
url 'http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01.0.tar.gz'
|
||||
sha1 '31ae98051d42e038f4fbc5fd338c4fa5c36744e0'
|
||||
homepage "http://ocaml.org"
|
||||
url "http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02.1.tar.gz"
|
||||
sha1 "6af8c67f2badece81d8e1d1ce70568a16e42313e"
|
||||
|
||||
head 'http://caml.inria.fr/svn/ocaml/trunk', :using => :svn
|
||||
|
||||
revision 1
|
||||
head "http://caml.inria.fr/svn/ocaml/trunk", :using => :svn
|
||||
|
||||
depends_on :x11 => :recommended
|
||||
|
||||
|
@ -18,12 +16,6 @@ class ObjectiveCaml < Formula
|
|||
sha1 "bde3be019fb30cc0221ddf78f4725b018f56b651" => :mountain_lion
|
||||
end
|
||||
|
||||
# recent versions of clang fail with a hard error if -fno-defer-pop
|
||||
# is specified, and older versions warn. This patch fixes the OCaml
|
||||
# configure script to not pass this option on recent MacOS versions.
|
||||
# See http://caml.inria.fr/mantis/view.php?id=6346 for upstream bug.
|
||||
patch :DATA
|
||||
|
||||
def install
|
||||
system "./configure", "--prefix", HOMEBREW_PREFIX,
|
||||
"--mandir", man,
|
||||
|
@ -43,24 +35,3 @@ class ObjectiveCaml < Formula
|
|||
(lib/"ocaml").install_symlink HOMEBREW_PREFIX/"lib/ocaml/site-lib"
|
||||
end
|
||||
end
|
||||
__END__
|
||||
diff --git a/configure b/configure
|
||||
index d45e88f..25d872b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -322,7 +322,14 @@ case "$bytecc,$target" in
|
||||
bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
|
||||
mathlib="";;
|
||||
*,*-*-darwin*)
|
||||
- bytecccompopts="-fno-defer-pop $gcc_warnings"
|
||||
+ # On recent version of OSX, gcc is a symlink to clang
|
||||
+ if $bytecc --version | grep -q clang; then
|
||||
+ # -fno-defer-pop is not supported by clang, and make recent
|
||||
+ # versions of clang to fail
|
||||
+ bytecccompopts="$gcc_warnings"
|
||||
+ else
|
||||
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
|
||||
+ fi
|
||||
mathlib=""
|
||||
mkexe="$mkexe -Wl,-no_compact_unwind"
|
||||
# Tell gcc that we can use 32-bit code addresses for threaded code
|
||||
|
|
Loading…
Reference in a new issue