The following commit has been merged in the master branch:
commit 4323ac997979dc7e4a1fd3c687a4520191b107d5
Author: Stephane Glondu <st...@glondu.net>
Date: Tue Apr 19 21:16:40 2011 +0200
Bugfix in 0008-Embed-bytecode-in-C-object-when-using-custom.patch
I got confused by so many negations...
diff --git a/debian/changelog b/debian/changelog
index db96b1d..cb761d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml (3.12.0-4) unstable; urgency=low
+
+ * Bugfix in 0008-Embed-bytecode-in-C-object-when-using-custom.patch:
+ "-output-obj" should not link a custom runtime! (Fixes FTBFS of
+ ocamlnet)
+
+ -- Stéphane Glondu <glo...@debian.org> Tue, 19 Apr 2011 21:16:33 +0200
+
ocaml (3.12.0-3) unstable; urgency=low
* Patch configure script so that hurd-i386 is also recognized as a
diff --git
a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
index 46f3f5a..3613d5e 100644
--- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -13,7 +13,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index 4a6426d..e2f7bcd 100644
+index 4a6426d..f0311ce 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -402,7 +402,7 @@ let output_cds_file outfile =
@@ -41,7 +41,7 @@ index 4a6426d..e2f7bcd 100644
+ return 0; /* not reached */\n\
+}\n"
+ end else begin
-+ output_string outchan "\n
++ output_string outchan "\n\
void caml_startup(char ** argv)\n\
{\n\
caml_startup_code(caml_code, sizeof(caml_code),\n\
@@ -59,7 +59,7 @@ index 4a6426d..e2f7bcd 100644
Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
if not !Clflags.custom_runtime then
link_bytecode tolink output_name true
-+ else if not !Clflags.make_runtime then
++ else if not !Clflags.output_c_object && not !Clflags.make_runtime then
+ let c_file = Filename.temp_file "camlobj" ".c" in
+ try
+ link_bytecode_as_c tolink c_file true;
--
OCaml packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
