projects / ocaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 694482a)
Refresh patches
authorStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:25:25 +0000 (16:25 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:25:25 +0000 (16:25 +0200)
debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch patch | blob | history
debian/patches/0002-Call-ld-with-proper-flags.patch patch | blob | history
debian/patches/0003-Don-t-use-rpath.patch patch | blob | history
debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch patch | blob | history
debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch patch | blob | history
debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch patch | blob | history
debian/patches/0009-Fix-asmcomp-tests-on-sparc.patch [deleted file] patch | blob | history
debian/patches/series patch | blob | history

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 1671302e8af1df8d7314b6e974dc25d61a429e36..bf9c2fbb0e0af363e78111505796f226a73d6281 100644 (file)
--- 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,10 +9,10 @@ code (bug#338437)
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 3edb9fd..406b19b 100755
+index 4ea1498..46149a7 100755
 --- a/configure
 +++ b/configure
-@@ -355,7 +355,8 @@ case "$bytecc,$target" in
+@@ -365,7 +365,8 @@ case "$bytecc,$target" in
    *gcc*,alpha*-*-linux*)
      if cc="$bytecc" sh ./hasgot -mieee; then
        bytecccompopts="-mieee $bytecccompopts";
@@ -22,7 +22,7 @@ index 3edb9fd..406b19b 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -872,6 +873,7 @@ case "$arch,$nativecc,$system,$target" in
+@@ -901,6 +902,7 @@ case "$arch,$nativecc,$system,$target" 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 4823058d6384d183e85fc9a5858c74cc84f9bae6..5ad1e40df0705d00d3af78cae9720c077aa30040 100644 (file)
--- 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 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 406b19b..726e144 100755
+index 46149a7..dfcb849 100755
 --- a/configure
 +++ b/configure
-@@ -1696,7 +1696,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> Makefile
+@@ -1743,7 +1743,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> 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 ae7c8bfe5683a10945fd94d3aa2f49a3de05a520..2aa47ad5b7b92c872ec4d79efd1f60e33c6a5447 100644 (file)
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -7,11 +7,11 @@ Subject: Don't use rpath
  1 file changed, 5 insertions(+)
 
 diff --git a/tools/ocamlmklib.ml b/tools/ocamlmklib.ml
-index 77ae57b..4fdb391 100644
+index 23a273e..a5e0d34 100644
 --- a/tools/ocamlmklib.ml
 +++ b/tools/ocamlmklib.ml
-@@ -37,6 +37,11 @@ and output_c = ref ""       (* Output name for C part of library *)
- and rpath = ref []          (* rpath options *)
+@@ -40,6 +40,11 @@ and rpath = ref []          (* rpath options *)
+ and debug = ref false       (* -g option *)
  and verbose = ref false
  
 +(* Debian specific: inhibit rpath *)
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 411a7529f43ad7c4825f5cbd5c268733e249dbad..d44abb7877fa960785eff8e223d5ef9571479226 100644 (file)
--- 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,7 +7,7 @@ Subject: Put manpages in section 3o instead of 3
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index 7a487c6..a6b11c4 100644
+index 7c6d988..7700434 100644
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
 @@ -312,7 +312,7 @@ test_texi: dummy
diff --git a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
index 2df48575cea45713f33d5d3236229b49e6d325ac..905c28cb9ba1a4d37ac44a565f0dbdaf41d26f73 100644 (file)
--- a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+++ b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
@@ -19,10 +19,10 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  3 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index c0f8f6a..778df01 100644
+index 2f5c0ec..7792b46 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -431,6 +431,19 @@ let output_cds_file outfile =
+@@ -439,6 +439,19 @@ let output_cds_file outfile =
      remove_file outfile;
      raise x
  
@@ -42,7 +42,7 @@ index c0f8f6a..778df01 100644
  (* Output a bytecode executable as a C file *)
  
  let link_bytecode_as_c ppf tolink outfile =
-@@ -473,7 +486,7 @@ let link_bytecode_as_c ppf tolink outfile =
+@@ -481,7 +494,7 @@ let link_bytecode_as_c ppf tolink outfile =
        (Marshal.to_string sections []);
      output_string outchan "\n};\n\n";
      (* The table of primitives *)
@@ -51,7 +51,7 @@ index c0f8f6a..778df01 100644
      (* The entry point *)
      output_string outchan "\
  \nvoid caml_startup(char ** argv)\
-@@ -554,7 +567,7 @@ let link ppf objfiles output_name =
+@@ -562,7 +575,7 @@ let link ppf objfiles output_name =
          #else\n\
          typedef long value;\n\
          #endif\n";
@@ -61,10 +61,10 @@ index c0f8f6a..778df01 100644
          #ifdef __cplusplus\n\
          }\n\
 diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
-index 1cc3a53..397fc25 100644
+index a0ce273..d94863d 100644
 --- a/bytecomp/symtable.ml
 +++ b/bytecomp/symtable.ml
-@@ -113,15 +113,17 @@ let output_primitive_names outchan =
+@@ -115,15 +115,17 @@ let output_primitive_names outchan =
  
  open Printf
  
diff --git a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
index d9a1c043b7feac564570b20ef9f92e489fd9643f..178ed45c98c509a750f3f8eef031316d0b0bfc20 100644 (file)
--- a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -22,10 +22,10 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  7 files changed, 57 insertions(+), 4 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index 778df01..5fcbcfe 100644
+index 7792b46..534433b 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -446,7 +446,7 @@ let mlvalues_primitives = [
+@@ -454,7 +454,7 @@ let mlvalues_primitives = [
  
  (* Output a bytecode executable as a C file *)
  
@@ -34,7 +34,7 @@ index 778df01..5fcbcfe 100644
    let outchan = open_out outfile in
    begin try
      (* The bytecode *)
-@@ -488,14 +488,27 @@ let link_bytecode_as_c ppf tolink outfile =
+@@ -496,14 +496,27 @@ let link_bytecode_as_c ppf tolink outfile =
      (* The table of primitives *)
      Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
@@ -64,7 +64,7 @@ index 778df01..5fcbcfe 100644
  \n#ifdef __cplusplus\
  \n}\
  \n#endif\n";
-@@ -534,6 +547,17 @@ let fix_exec_name name =
+@@ -542,6 +555,17 @@ let fix_exec_name name =
        if String.contains name '.' then name else name ^ ".exe"
    | _ -> name
  
@@ -82,7 +82,7 @@ index 778df01..5fcbcfe 100644
  (* Main entry point (build a custom runtime if needed) *)
  
  let link ppf objfiles output_name =
-@@ -548,6 +572,16 @@ let link ppf objfiles output_name =
+@@ -556,6 +580,16 @@ let link ppf objfiles output_name =
    Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
    if not !Clflags.custom_runtime then
      link_bytecode ppf tolink output_name true
@@ -99,7 +99,7 @@ index 778df01..5fcbcfe 100644
    else if not !Clflags.output_c_object then begin
      let bytecode_name = Filename.temp_file "camlcode" "" in
      let prim_name = Filename.temp_file "camlprim" ".c" in
-@@ -590,7 +624,7 @@ let link ppf objfiles output_name =
+@@ -605,7 +639,7 @@ let link ppf objfiles output_name =
      if Sys.file_exists c_file then raise(Error(File_exists c_file));
      let temps = ref [] in
      try
@@ -122,7 +122,7 @@ index 3cf4a15..d1ad48c 100644
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
 diff --git a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile
-index 58b5ed8..48d8796 100644
+index d89c532..5e640ac 100644
 --- a/testsuite/tests/callback/Makefile
 +++ b/testsuite/tests/callback/Makefile
 @@ -16,6 +16,9 @@ CC=$(NATIVECC) -I $(CTOPDIR)/byterun
@@ -136,7 +136,7 @@ index 58b5ed8..48d8796 100644
  default:
        @case " $(OTHERLIBRARIES) " in \
 diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile
-index a8de4dc..b72581f 100644
+index 088b021..f0c3d28 100644
 --- a/testsuite/tests/embedded/Makefile
 +++ b/testsuite/tests/embedded/Makefile
 @@ -13,6 +13,10 @@
@@ -164,7 +164,7 @@ index a108953..9c1ff43 100644
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
 diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile
-index 832e367..4653631 100644
+index f9b1c6f..1e8377d 100644
 --- a/testsuite/tests/lib-dynlink-bytecode/Makefile
 +++ b/testsuite/tests/lib-dynlink-bytecode/Makefile
 @@ -15,6 +15,9 @@ BASEDIR=../..
diff --git a/debian/patches/0009-Fix-asmcomp-tests-on-sparc.patch b/debian/patches/0009-Fix-asmcomp-tests-on-sparc.patch
deleted file mode 100644 (file)
index cd8f48d..0000000
--- a/debian/patches/0009-Fix-asmcomp-tests-on-sparc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Thu, 20 Nov 2014 16:48:12 +0100
-Subject: Fix asmcomp tests on sparc
-
-Bug: http://caml.inria.fr/mantis/view.php?id=6665
----
- testsuite/tests/asmcomp/sparc.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S
-index ea02957..f2b9ce2 100644
---- a/testsuite/tests/asmcomp/sparc.S
-+++ b/testsuite/tests/asmcomp/sparc.S
-@@ -10,7 +10,7 @@
- /*                                                                     */
- /***********************************************************************/
- 
--#if defined(SYS_solaris) || defined(SYS_elf)
-+#if defined(SYS_solaris) || defined(SYS_linux)
- #define Call_gen_code call_gen_code
- #define Caml_c_call caml_c_call
- #else
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 96ba831d81aa7f8b3cb3d7238167f60a7d2eb8d0..70f532ea27ae9105000f61cf89019ed708194bec 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 0006-Embed-bytecode-in-C-object-when-using-custom.patch
 0007-Tune-resource-usage-of-some-tests.patch
 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
-0009-Fix-asmcomp-tests-on-sparc.patch
Unnamed repository; edit this file 'description' to name the repository.