The following commit has been merged in the master branch: commit f2b31c94981f4fa415d67a963a276fc137c1e2da Author: Stephane Glondu <st...@glondu.net> Date: Wed Jun 15 18:24:24 2011 +0200
Refresh patches diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index c9f4359..02f44e3 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -9,7 +9,7 @@ code (bug#338437) 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index 66ccda9..2b40fc2 100755 +index 37d46c2..fa96ef8 100755 --- a/configure +++ b/configure @@ -284,7 +284,8 @@ case "$bytecc,$host" in @@ -22,7 +22,7 @@ index 66ccda9..2b40fc2 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -731,6 +732,7 @@ case "$arch,$nativecc,$system,$host_type" in +@@ -738,6 +739,7 @@ case "$arch,$nativecc,$system,$host_type" in nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" if $arch64; then partialld="ld -r -arch ppc64"; fi;; diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index 42f477a..b32b909 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -10,10 +10,10 @@ gcc. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index 2b40fc2..7a34621 100755 +index fa96ef8..40a78cb 100755 --- a/configure +++ b/configure -@@ -1632,7 +1632,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1639,7 +1639,7 @@ echo "DEBUGGER=$debugger" >> Makefile echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 1442816..83a5f55 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -7,7 +7,7 @@ Subject: Don't use rpath 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp -index 6b78a68..95f5674 100644 +index 8374439..b8d9e33 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp @@ -37,6 +37,11 @@ and output_c = ref "" (* Output name for C part of library *) diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 14f758b..7231e22 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -7,10 +7,10 @@ Subject: Put manpages in section 3o instead of 3 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index 2d8b0ea..30684ee 100644 +index 8f6e87c..ace934c 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -319,7 +319,7 @@ test_texi: dummy +@@ -318,7 +318,7 @@ test_texi: dummy stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch index 3308a86..809ffcb 100644 --- a/debian/patches/0005-Patch-config.sh-for-installation.patch +++ b/debian/patches/0005-Patch-config.sh-for-installation.patch @@ -9,7 +9,7 @@ Use for installatation a patched config.sh (created by debian/rules). 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install.sh b/build/install.sh -index a7ab103..b42373d 100755 +index 2785932..e8a6c15 100755 --- a/build/install.sh +++ b/build/install.sh @@ -18,7 +18,7 @@ set -e diff --git a/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch deleted file mode 100644 index 76d382b..0000000 --- a/debian/patches/0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Tue, 8 Mar 2011 21:17:40 +0100 -Subject: Fix ocamlopt w.r.t. binutils 2.21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: http://caml.inria.fr/mantis/view.php?id=5237 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 -Authors: Eric Cooper, spiralvoice -Reviewed-by: Stéphane Glondu <st...@glondu.net> ---- - asmcomp/amd64/emit.mlp | 13 +++++++------ - asmcomp/i386/emit.mlp | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp -index 55da47b..45afbb7 100644 ---- a/asmcomp/amd64/emit.mlp -+++ b/asmcomp/amd64/emit.mlp -@@ -688,17 +688,18 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -+ begin match Config.system with -+ "linux" | "gnu" -> -+ ` .type {emit_symbol fundecl.fun_name},@function\n`; -+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -+ | _ -> () -+ end; - if !float_constants <> [] then begin - if macosx - then ` .literal8\n` - else ` .section .rodata.cst8,\"a\",@progbits\n`; - List.iter emit_float_constant !float_constants -- end; -- match Config.system with -- "linux" | "gnu" -> -- ` .type {emit_symbol fundecl.fun_name},@function\n`; -- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ end - - (* Emission of data *) - -diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp -index 3baba2e..b29f365 100644 ---- a/asmcomp/i386/emit.mlp -+++ b/asmcomp/i386/emit.mlp -@@ -905,12 +905,12 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -- List.iter emit_float_constant !float_constants; -- match Config.system with -+ begin match Config.system with - "linux_elf" | "bsd_elf" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ | _ -> () end; -+ List.iter emit_float_constant !float_constants - - - (* Emission of data *) --- diff --git a/debian/patches/0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch similarity index 92% rename from debian/patches/0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch rename to debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch index 6b28f40..ec90bbd 100644 --- a/debian/patches/0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch +++ b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch @@ -14,10 +14,10 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure b/configure -index 7a34621..32e8d2e 100755 +index 40a78cb..dbad12d 100755 --- a/configure +++ b/configure -@@ -619,13 +619,14 @@ if test $withsharedlibs = "yes"; then +@@ -620,13 +620,14 @@ if test $withsharedlibs = "yes"; then case "$host" in *-*-cygwin*) natdynlink=true;; i[3456]86-*-linux*) natdynlink=true;; diff --git a/debian/patches/0009-Declare-primitive-name-table-as-const-char.patch b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch similarity index 100% rename from debian/patches/0009-Declare-primitive-name-table-as-const-char.patch rename to debian/patches/0008-Declare-primitive-name-table-as-const-char.patch diff --git a/debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch similarity index 95% rename from debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch rename to debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch index 5543fcb..8e2f73b 100644 --- a/debian/patches/0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch +++ b/debian/patches/0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch @@ -18,7 +18,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index 4a6426d..47903c4 100644 +index bd8f3b2..9d62fc6 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -400,6 +400,19 @@ let output_cds_file outfile = @@ -41,15 +41,15 @@ index 4a6426d..47903c4 100644 (* Output a bytecode executable as a C file *) let link_bytecode_as_c tolink outfile = -@@ -442,7 +455,7 @@ CAMLextern void caml_startup_code(\n\ +@@ -442,7 +455,7 @@ let link_bytecode_as_c tolink outfile = (Marshal.to_string sections []); output_string outchan "\n};\n\n"; (* The table of primitives *) - Symtable.output_primitive_table outchan; + Symtable.output_primitive_table outchan mlvalues_primitives; (* The entry point *) - output_string outchan "\n\ - void caml_startup(char ** argv)\n\ + output_string outchan "\ + \nvoid caml_startup(char ** argv)\ @@ -516,7 +529,7 @@ let link objfiles output_name = #else\n\ typedef long value;\n\ diff --git a/debian/patches/0012-Properly-initialize-executable-name-in-caml_startup_.patch b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch similarity index 97% rename from debian/patches/0012-Properly-initialize-executable-name-in-caml_startup_.patch rename to debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch index 2106754..f44e1e2 100644 --- a/debian/patches/0012-Properly-initialize-executable-name-in-caml_startup_.patch +++ b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch @@ -9,7 +9,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/byterun/startup.c b/byterun/startup.c -index 57cbb73..9fe288c 100644 +index db273b2..780cb1e 100644 --- a/byterun/startup.c +++ b/byterun/startup.c @@ -443,6 +443,10 @@ CAMLexport void caml_startup_code( diff --git a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch index 8552379..3f17f1d 100644 --- a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch @@ -15,7 +15,7 @@ Signed-off-by: Stephane Glondu <st...@glondu.net> 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index 47903c4..e63dd3b 100644 +index 9d62fc6..a3aee28 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -415,7 +415,7 @@ let mlvalues_primitives = [ @@ -27,36 +27,36 @@ index 47903c4..e63dd3b 100644 let outchan = open_out outfile in begin try (* The bytecode *) -@@ -457,14 +457,27 @@ CAMLextern void caml_startup_code(\n\ +@@ -457,14 +457,27 @@ let link_bytecode_as_c tolink outfile = (* The table of primitives *) Symtable.output_primitive_table outchan mlvalues_primitives; (* The entry point *) -- output_string outchan "\n\ +- output_string outchan "\ + if with_main then begin -+ output_string outchan "\n\ -+int main(int argc, char **argv)\n\ -+{\n\ -+ caml_startup_code(caml_code, sizeof(caml_code),\n\ -+ caml_data, sizeof(caml_data),\n\ -+ caml_sections, sizeof(caml_sections),\n\ -+ argv);\n\ -+ return 0; /* not reached */\n\ -+}\n" ++ output_string outchan "\ ++\nint main(int argc, char **argv)\ ++\n{\ ++\n caml_startup_code(caml_code, sizeof(caml_code),\ ++\n caml_data, sizeof(caml_data),\ ++\n caml_sections, sizeof(caml_sections),\ ++\n argv);\ ++\n return 0; /* not reached */\ ++\n}\n" + end else begin -+ output_string outchan "\n\ - void caml_startup(char ** argv)\n\ - {\n\ - caml_startup_code(caml_code, sizeof(caml_code),\n\ - caml_data, sizeof(caml_data),\n\ - caml_sections, sizeof(caml_sections),\n\ - argv);\n\ --}\n\ -+}\n" ++ output_string outchan "\ + \nvoid caml_startup(char ** argv)\ + \n{\ + \n caml_startup_code(caml_code, sizeof(caml_code),\ + \n caml_data, sizeof(caml_data),\ + \n caml_sections, sizeof(caml_sections),\ + \n argv);\ +-\n}\ ++\n}\n" + end; + output_string outchan "\ - #ifdef __cplusplus\n\ - }\n\ - #endif\n"; + \n#ifdef __cplusplus\ + \n}\ + \n#endif\n"; @@ -501,6 +514,11 @@ let fix_exec_name name = if String.contains name '.' then name else name ^ ".exe" | _ -> name diff --git a/debian/patches/0013-Force-aligned-access-for-double-and-int64-on-mips.patch b/debian/patches/0013-Force-aligned-access-for-double-and-int64-on-mips.patch deleted file mode 100644 index 35e8097..0000000 --- a/debian/patches/0013-Force-aligned-access-for-double-and-int64-on-mips.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Sat, 28 May 2011 23:55:08 +0200 -Subject: Force aligned access for double and int64 on mips* - -Some mips machines accept unaligned accesses, others don't. Therefore, -do not rely on auto-detection. - -Signed-off-by: Stephane Glondu <st...@glondu.net> ---- - configure | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 32e8d2e..e03a4b8 100755 ---- a/configure -+++ b/configure -@@ -434,7 +434,7 @@ esac - # Determine alignment constraints - - case "$host" in -- sparc*-*-*|hppa*-*-*|arm*-*-*) -+ sparc*-*-*|hppa*-*-*|arm*-*-*|mips*-*-*) - # On Sparc V9 with certain versions of gcc, determination of double - # alignment is not reliable (PR#1521), hence force it. - # Same goes for hppa. -@@ -467,7 +467,7 @@ esac - if $int64_native; then - case "$host" in - # PR#5088: autodetection is unreliable on ARM -- sparc*-*-*|hppa*-*-*|arm*-*-*) -+ sparc*-*-*|hppa*-*-*|arm*-*-*|mips*-*-*) - if test $2 = 8; then - echo "64-bit integers can be word-aligned." - echo "#undef ARCH_ALIGN_INT64" >> m.h --- diff --git a/debian/patches/series b/debian/patches/series index fa726e6..43d48de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,10 +4,8 @@ 0004-Put-manpages-in-section-3o-instead-of-3.patch 0005-Patch-config.sh-for-installation.patch 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch -0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch -0008-Natdynlink-works-on-powerpc-and-hurd-i386.patch -0009-Declare-primitive-name-table-as-const-char.patch -0010-Avoid-multiple-declarations-in-generated-.c-files-in.patch +0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch +0008-Declare-primitive-name-table-as-const-char.patch +0009-Avoid-multiple-declarations-in-generated-.c-files-in.patch +0010-Properly-initialize-executable-name-in-caml_startup_.patch 0011-Embed-bytecode-in-C-object-when-using-custom.patch -0012-Properly-initialize-executable-name-in-caml_startup_.patch -0013-Force-aligned-access-for-double-and-int64-on-mips.patch -- OCaml 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