[Lunar-commits] <moonbase-other> graphviz: add ocaml fix and missing ampersands

[v4hn]

commit 28184625c12fb6a8dd818aa01e7b20d5e066fb76
Author: v4hn <me at v4hn.de>
Date: Thu, 06 Dec 2012 18:38:36 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/28184625c12fb6a8dd818aa01e7b20d5e066fb76

graphviz: add ocaml fix and missing ampersands
---
  graphics/graphviz/BUILD | +8/-6     
  1 file changed, 8 insertions(+), 6 deletions(-)

--- a/graphics/graphviz/BUILD
+++ b/graphics/graphviz/BUILD
@@ -1,20 +1,22 @@
 (
 
   patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+  # fix swig generation with current ocaml
+  sedit "3364 s:\(^.*$\):\1; sed -i \"/int caml_array_length/ d\" gv_ocaml.cpp:" tclpkg/gv/Makefile.in &&
 
 # This line takes care of the cannot find libperl.so rebuild that
 # happens on a lunar fix.
-  PERL_MAJ_VER="`lvu version perl |cut -c 1`"
-  PERL_VER="`lvu version perl`"
-  PERL_SO_PATH="/usr/lib/perl$PERL_MAJ_VER/$PERL_VER/`arch`-linux-thread-multi/CORE/"
+  PERL_MAJ_VER="`lvu version perl |cut -c 1`" &&
+  PERL_VER="`lvu version perl`" &&
+  PERL_SO_PATH="/usr/lib/perl$PERL_MAJ_VER/$PERL_VER/`arch`-linux-thread-multi/CORE/" &&
 # If you have R installed you will get the same type rebuild kick off because
 # libR.so cannot be found.
-  R_SO_PATH="/usr/lib/R/lib "
+  R_SO_PATH="/usr/lib/R/lib " &&
 # So lets put all that together.
-  LDFLAGS="$LDFLAGS -Wl,-rpath,${PERL_SO_PATH},-rpath,${R_SO_PATH}"
+  LDFLAGS="$LDFLAGS -Wl,-rpath,${PERL_SO_PATH},-rpath,${R_SO_PATH}" &&
 # done
 
-  OPTS+=" --with-libgd --with-fontconfig"
+  OPTS+=" --with-libgd --with-fontconfig" &&
 
   default_build &&