The following commit has been merged in the master branch: commit 472b49f28c999d3c97e0f988226ca7fb80ed5a6e Author: Stephane Glondu <st...@glondu.net> Date: Wed Jun 15 09:18:14 2011 +0200
Fix link order in library detection test diff --git a/debian/changelog b/debian/changelog index 8d7b410..2440034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lwt (2.3.0-3) UNRELEASED; urgency=low + + * Fix link order in library detection test (fixes FTBFS on Ubuntu) + + -- Stéphane Glondu <glo...@debian.org> Wed, 15 Jun 2011 09:17:44 +0200 + lwt (2.3.0-2) unstable; urgency=low * Fix FTBFS on Hurd due to use of PATH_MAX and HOSTNAME_MAX diff --git a/debian/patches/0003-Fix-link-order-in-library-detection-test.patch b/debian/patches/0003-Fix-link-order-in-library-detection-test.patch new file mode 100644 index 0000000..ae6bd22 --- /dev/null +++ b/debian/patches/0003-Fix-link-order-in-library-detection-test.patch @@ -0,0 +1,28 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Wed, 15 Jun 2011 09:15:54 +0200 +Subject: Fix link order in library detection test + +The wrong link order was causing a build failure on Ubuntu, where the +linker is stricter. + +Signed-off-by: Stephane Glondu <st...@glondu.net> +--- + discover.ml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/discover.ml b/discover.ml +index 09361a4..fbb6f63 100644 +--- a/discover.ml ++++ b/discover.ml +@@ -163,9 +163,9 @@ let compile args stub_file = + Sys.command + "%s -custom %s %s %s %s 2> %s" + !ocamlc +- args + c_args + (Filename.quote stub_file) ++ args + (Filename.quote !caml_file) + (Filename.quote !log_file) + = 0 +-- diff --git a/debian/patches/series b/debian/patches/series index 880e4d9..087837e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Do-not-build-manual-manual.pdf.patch 0002-Fix-FTBFS-on-hurd.patch +0003-Fix-link-order-in-library-detection-test.patch -- Cooperative light-weight thread library for OCaml _______________________________________________ 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