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

Guillaume Yziquel guillaume.yziquel at citycable.ch
Tue Oct 27 13:26:33 UTC 2009


The following commit has been merged in the master branch:
commit a162c3999b081c0d381be80122e786ac2b626e19
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date:   Tue Oct 27 14:26:13 2009 +0100

    Removing Rdevices from src/Makefile.

diff --git a/debian/patches/new-build-system.diff b/debian/patches/new-build-system.diff
index 4e1e124..8f463a7 100644
--- a/debian/patches/new-build-system.diff
+++ b/debian/patches/new-build-system.diff
@@ -23,10 +23,10 @@ Subject: [PATCH] Replacing build system by a more direct one.
 -	$(OCAMLMKLIB) -custom -o `basename $@ .cma` $(LINKFLAGS_MATH_BYTE) \
 -	$(LIBMATH_COBJ_FILES) $(LIBMATH_CMOFILES)
 +r.cma: dllr_base_stubs.so dllr_data_stubs.so r.cmo r.cmi
-+	ocamlc -a -dllpath /usr/lib/R/lib -dllib dllr_base_stubs.so -dllib dllr_data_stubs.so -dllib libR.so -o r.cma rdevices.cmo r.cmo
++	ocamlc -a -dllpath /usr/lib/R/lib -dllib dllr_base_stubs.so -dllib dllr_data_stubs.so -dllib libR.so -o r.cma r.cmo
 +
 +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 rdevices.cmx r.cmx
++	ocamlopt -a -ccopt -L/usr/lib/R/lib -cclib -lr_base_stubs -cclib -lr_data_stubs -cclib -lR -o r.cmxa r.cmx
 +
 +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

-- 
ocaml-r packaging



More information about the Pkg-ocaml-maint-commits mailing list