[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.0.rc1-1-8-g6032225

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1a923618ebdeb4416fad0e245246c32df176ce43
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 29 07:25:42 2010 +0200

    Add 0001-Move-the-cmxs-rule-to-Before_rules.patch

diff --git a/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch b/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch
new file mode 100644
index 0000000..d971a6b
--- /dev/null
+++ b/debian/patches/0001-Move-the-cmxs-rule-to-Before_rules.patch
@@ -0,0 +1,49 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 29 Apr 2010 07:24:15 +0200
+Subject: [PATCH] Move the cmxs rule to Before_rules
+
+Move the cmxs rule to Before_rules, so that it overrides the built-in
+rules (which are present in OCaml 3.12).
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ myocamlbuild.ml |   18 ++++++++++--------
+ 1 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/myocamlbuild.ml b/myocamlbuild.ml
+index 712e121..6bd3547 100644
+--- a/myocamlbuild.ml
++++ b/myocamlbuild.ml
+@@ -123,6 +123,16 @@ let _ =
+         Options.ocamldep := ocamlfind "ocamldep";
+         Options.ocamldoc := S[A"ocamlfind"; A"ocamldoc"; A"-hide-warnings"]
+ 
++    | Before_rules ->
++
++        (* +---------------------------------------------------------+
++           | Shared libraries                                        |
++           +---------------------------------------------------------+ *)
++
++        rule "shared libraries (cmxs)"
++          ~dep:"%.cmxa" ~prod:"%.cmxs"
++          (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")]))
++
+     | After_rules ->
+ 
+         (* +---------------------------------------------------------+
+@@ -138,14 +148,6 @@ let _ =
+         virtual_rule "native" & ["META"; "usb.cmxa"; "usb.cmxs"];
+ 
+         (* +---------------------------------------------------------+
+-           | Shared libraries                                        |
+-           +---------------------------------------------------------+ *)
+-
+-        rule "shared libraries (cmxs)"
+-          ~dep:"%.cmxa" ~prod:"%.cmxs"
+-          (fun env _ -> Cmd(S[!(Options.ocamlopt); A"-cclib"; A"-L."; A"-shared"; A"-linkall"; A(env "%.cmxa"); A"-o"; A(env "%.cmxs")]));
+-
+-        (* +---------------------------------------------------------+
+            | Ocamlfind stuff                                         |
+            +---------------------------------------------------------+ *)
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cb900f9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Move-the-cmxs-rule-to-Before_rules.patch

-- 
ocaml-usb packaging