[Lunar-commits] <moonbase> llvm: fix build

[Michael 'v4hn' Goerner]

commit 3e258401144724b965714374ddd77cc029b88bbe
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Tue May 22 19:02:27 2012 +0200

    llvm: fix build
---
 compilers/llvm/BUILD     |   12 ++++++------
 compilers/llvm/DEPENDS   |    2 +-
 compilers/llvm/PRE_BUILD |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compilers/llvm/BUILD b/compilers/llvm/BUILD
index 1fc4fb1..3b26c12 100644
--- a/compilers/llvm/BUILD
+++ b/compilers/llvm/BUILD
@@ -1,15 +1,15 @@
 (
 
-  OPTS+=" --enable-optimized --enable-shared --enable-pic --enable-targets=host-only"
+  sedit 's;install-meta:: $(ObjDir)/META.llvm;install-meta:: META.llvm;' bindings/ocaml/llvm/Makefile &&
+
+  OPTS+=" --enable-optimized --enable-shared --enable-pic --enable-targets=host-only" &&
 
   if [ "$USE_ASSERTS" == "y" ] ; then
-     OPTS="--enable-assertions"
+     OPTS+=" --enable-assertions"
    else
-     OPTS="--disable-assertions"
+     OPTS+=" --disable-assertions"
   fi &&
 
-  default_build   &&
-
-  prepare_install
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/llvm/DEPENDS b/compilers/llvm/DEPENDS
index dfc6624..56ab133 100644
--- a/compilers/llvm/DEPENDS
+++ b/compilers/llvm/DEPENDS
@@ -3,4 +3,4 @@ depends  udis86
 optional_depends tcl     ""                 ""                  "for tcl support"
 optional_depends libffi  "--enable-libffi"  "--disable-libffi"  "for high level programming support"
 optional_depends doxygen "--enable-doxygen" "--disable-doxygen" "for documentation support"
-optional_depends ocaml   ""                 ""                  "for ocaml support"
+optional_depends ocaml   "--enable-bindings"                 "--disable-bindings"                  "for ocaml bindings"
diff --git a/compilers/llvm/PRE_BUILD b/compilers/llvm/PRE_BUILD
index 9b672b6..40ca729 100644
--- a/compilers/llvm/PRE_BUILD
+++ b/compilers/llvm/PRE_BUILD
@@ -3,6 +3,6 @@ default_pre_build  &&
 if [[ "$USE_CLANG" = "y" ]]; then
   cd $SOURCE_DIRECTORY/tools  &&
   unpack $SOURCE2  &&
-  mv -f clang-$VERSION clang  &&
+  mv -f clang-${VERSION}.src clang  &&
   cd $SOURCE_DIRECTORY
 fi