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

2011-11-16 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit f0a04a7d877506f2989e39aedb3a7d2bef51a9d7
Author: Stephane Glondu 
Date:   Thu Nov 17 08:02:27 2011 +0100

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 98acbf1..e69c450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+janest-core (107.01-5) unstable; urgency=low
+
+  * Fix FTBFS on some architectures by forcing link with -lrt
+
+ -- Stéphane Glondu   Thu, 17 Nov 2011 08:02:17 +0100
+
 janest-core (107.01-4) unstable; urgency=low
 
   [ Stéphane Glondu ]

-- 
janest-core packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

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

2011-11-16 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit b0fac3ee112267ce2e0ce531b9a46067716b4975
Author: Stephane Glondu 
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 000..19332bf
--- /dev/null
+++ b/debian/patches/0001-Force-linking-with-lrt.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu 
+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 000..bcf0809
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Force-linking-with-lrt.patch

-- 
janest-core packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits