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

[Guillaume Yziquel]

The following commit has been merged in the master branch:
commit 913498b994d6cae1cfc3534021d8b9ebd0657e83
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Fri Nov 6 14:19:29 2009 +0100

    Building r.cmxs

diff --git a/debian/libr-ocaml.install.in b/debian/libr-ocaml.install.in
index 7b40cbf..2e38390 100644
--- a/debian/libr-ocaml.install.in
+++ b/debian/libr-ocaml.install.in
@@ -1,4 +1,5 @@
 src/*.cma             @OCamlStdlibDir@/R
 src/*.so              @OCamlDllDir@
 OPT: src/*.a          @OCamlStdlibDir@/R
+OPT: src/*.cmxs       @OCamlStdlibDir@/R
 debian/META           @OCamlStdlibDir@/R
diff --git a/debian/patches/cmxs.diff b/debian/patches/cmxs.diff
new file mode 100644
index 0000000..626b05c
--- /dev/null
+++ b/debian/patches/cmxs.diff
@@ -0,0 +1,21 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -64,7 +64,7 @@
+ ############
+ opt: lib
+ byte: lib_byte $(PA_R)
+-lib: $(LIB) $(LIB_CMI) $(LIBMATH) $(LIBMATH_CMI)
++lib: $(LIB) $(LIB_CMI) $(LIBMATH) $(LIBMATH_CMI) r.cmxs
+ lib_byte: $(LIB_BYTE) $(LIB_CMI) $(LIBMATH_BYTE) $(LIBMATH_CMI)
+ 
+ all: byte opt
+@@ -75,6 +75,9 @@
+ 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 -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
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5f49574..d9d2924 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fPIC.diff
 cleaning.diff
 new-build-system.diff
+cmxs.diff

-- 
ocaml-r packaging