[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/107.01-4-2-gf0a04a7

Stephane Glondu steph at glondu.net
Thu Nov 17 07:20:55 UTC 2011


The following commit has been merged in the master branch:
commit b0fac3ee112267ce2e0ce531b9a46067716b4975
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Nov 17 07:45:17 2011 +0100

    Force linking with -lrt

diff --git a/debian/patches/0001-Force-linking-with-lrt.patch b/debian/patches/0001-Force-linking-with-lrt.patch
new file mode 100644
index 0000000..19332bf
--- /dev/null
+++ b/debian/patches/0001-Force-linking-with-lrt.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 17 Nov 2011 07:45:05 +0100
+Subject: Force linking with -lrt
+
+It is needed for clock_* functions, but its need is misdetected on (at
+least) hurd, kfreebsd-*, mips*, powerpc and s390, causing FTBFS.
+---
+ myocamlbuild.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/myocamlbuild.ml b/myocamlbuild.ml
+index 233a58c..c88a61d 100644
+--- a/myocamlbuild.ml
++++ b/myocamlbuild.ml
+@@ -403,10 +403,10 @@ module MyOCamlbuildBase = struct
+               (fun (lib, dir, headers) ->
+                    (* Handle C part of library *)
+                    flag ["link"; "library"; "ocaml"; "byte"; "use_lib"^lib]
+-                     (S[A"-dllib"; A("-l"^lib); A"-cclib"; A("-l"^lib)]);
++                     (S[A"-dllib"; A("-l"^lib); A"-cclib"; A("-l"^lib); A"-cclib"; A"-lrt"]);
+   
+                    flag ["link"; "library"; "ocaml"; "native"; "use_lib"^lib]
+-                     (S[A"-cclib"; A("-l"^lib)]);
++                     (S[A"-cclib"; A("-l"^lib); A"-cclib"; A"-lrt"]);
+                         
+                    flag ["link"; "program"; "ocaml"; "byte"; "use_lib"^lib]
+                      (S[A"-dllib"; A("dll"^lib)]);
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bcf0809
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Force-linking-with-lrt.patch

-- 
janest-core packaging



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