[Pkg-ocaml-maint-commits] [SCM] ocaml-r packaging branch, master, updated. upstream/0.1-27-g6c560a1

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit 6c560a163157b8387911a71f4763b23c8f1bbe82
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Fri Nov 6 16:59:12 2009 +0100

    Tweaking build of .cmxs file.

diff --git a/debian/patches/cmxs.diff b/debian/patches/cmxs.diff
index 0124b00..dd7d206 100644
--- a/debian/patches/cmxs.diff
+++ b/debian/patches/cmxs.diff
@@ -5,17 +5,26 @@
  opt: lib
  byte: lib_byte $(PA_R)
 -lib: $(LIB) $(LIB_CMI) $(LIBMATH) $(LIBMATH_CMI)
-+lib: $(LIB) $(LIB_CMI) $(LIBMATH) $(LIBMATH_CMI) r.cmxs
++lib: $(LIB) $(LIB_CMI) $(LIBMATH) $(LIBMATH_CMI) r.cmxs rmath.cmxs
  lib_byte: $(LIB_BYTE) $(LIB_CMI) $(LIBMATH_BYTE) $(LIBMATH_CMI)
  
  all: byte opt
-@@ -75,6 +75,9 @@
+@@ -75,12 +75,18 @@
  r.cmxa: dllr_base_stubs.so dllr_data_stubs.so r.cmx r.cmi
  	ocamlopt -a -ccopt -L/usr/lib/R/lib -cclib -lr_base_stubs -cclib -lr_data_stubs -cclib -lR -o r.cmxa r.cmx
  
 +r.cmxs: r.cmxa
-+	ocamlopt -shared -linkall -ccopt -L/usr/lib/R/lib -cclib -lr_data_stubs -o $@ $<
++	ocamlopt -shared -linkall -ccopt -L/usr/lib/R/lib -ccopt -L. -o $@ $<
 +
  rmath.cma: dllr_math_stubs.so rmath.cmo rmath.cmi
  	ocamlc -a -dllib dllr_math_stubs.so -dllib libRmath.so -o rmath.cma rmath.cmo
  
+ rmath.cmxa: dllr_math_stubs.so rmath.cmx rmath.cmi
+ 	ocamlopt -a -cclib -lr_math_stubs -cclib -lRmath -o rmath.cmxa rmath.cmx
+ 
++rmath.cmxs: r.cmxa
++	ocamlopt -shared -linkall -o $@ $<
++
+ dllr_base_stubs.so: libr_base_stubs.a r_base.o
+ 	ocamlmklib -o r_base_stubs r_base.o
+ 

-- 
ocaml-r packaging