From 6044305f708078a589a03fa72721083a682ebd4c Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 4 Jul 2017 19:00:07 +0200 Subject: [PATCH] Update d/patches --- .../0001-Pass-no-relax-to-ld-on-alpha.patch | 4 +-- .../0002-Call-ld-with-proper-flags.patch | 12 ++++---- ...-manpages-in-section-3o-instead-of-3.patch | 10 +++---- ...eclarations-in-generated-.c-files-in.patch | 6 ++-- debian/patches/0009-Skip-native-tests.patch | 30 ------------------- debian/patches/0010-arm-default-PIC.patch | 2 +- debian/patches/series | 4 +-- 7 files changed, 19 insertions(+), 49 deletions(-) delete mode 100644 debian/patches/0009-Skip-native-tests.patch 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 63c6de48..4a2d663e 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 @@ -10,7 +10,7 @@ code (bug#338437) --- a/configure +++ b/configure -@@ -401,7 +401,8 @@ +@@ -448,7 +448,8 @@ *gcc*,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -20,7 +20,7 @@ code (bug#338437) *,mips-*-irix6*) # Turn off warning "unused library" bytecclinkopts="-n32 -Wl,-woff,84";; -@@ -922,6 +923,7 @@ +@@ -972,6 +973,7 @@ case "$arch,$nativecc,$system,$model" in *,*,nextstep,*) nativecclinkopts="-posix";; *,*,rhapsody,*) 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 b965f8a6..da9d8063 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -11,12 +11,12 @@ gcc. --- a/configure +++ b/configure -@@ -1946,7 +1946,7 @@ +@@ -2039,7 +2039,7 @@ + echo "OTHERLIBRARIES=$otherlibraries" >> Makefile echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile - echo "PARTIALLD=$partialld" >> Makefile --echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " \ -+echo "PACKLD=\$(PARTIALLD) $(echo $nativecclinkopts|sed s/-Wl,//g) -o " \ - | sed -e 's/ $/\\ /' >> Makefile - echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile +-echo "PACKLD=$partialld $nativecclinkopts -o\\ " >> Makefile ++echo "PACKLD=$partialld $(echo $nativecclinkopts|sed s/-Wl,//g) -o\\ " >> Makefile echo "IFLEXDIR=$iflexdir" >> Makefile + echo "O=o" >> Makefile + echo "A=a" >> Makefile 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 7cfffa68..2597b137 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 @@ -8,12 +8,12 @@ Subject: Put manpages in section 3o instead of 3 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -320,7 +320,7 @@ - stdlib_man/Pervasives.3o: $(STDLIB_MLIS) +@@ -387,7 +387,7 @@ + stdlib_man/Pervasives.3o: $(OCAMLDOC) $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ -- -t "OCaml library" -man-mini \ -+ -t "OCaml library" -man-mini -man-section 3o \ - $(STDLIB_MLIS) +- -t "OCaml library" -man-mini $(STDLIB_MLIS) ++ -t "OCaml library" -man-mini -man-section 3o $(STDLIB_MLIS) stdlib_html/Pervasives.html: $(STDLIB_MLIS) + $(MKDIR) stdlib_html 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 537bb509..48e83572 100644 --- 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 @@ -50,7 +50,7 @@ Signed-off-by: Stephane Glondu (* The entry point *) output_string outchan "\ \nvoid caml_startup(char ** argv)\ -@@ -580,7 +594,7 @@ +@@ -587,7 +601,7 @@ #else\n\ typedef long value;\n\ #endif\n"; @@ -61,7 +61,7 @@ Signed-off-by: Stephane Glondu }\n\ --- a/bytecomp/symtable.ml +++ b/bytecomp/symtable.ml -@@ -118,15 +118,17 @@ +@@ -112,15 +112,17 @@ open Printf @@ -92,4 +92,4 @@ Signed-off-by: Stephane Glondu +val output_primitive_table: out_channel -> string list -> unit val data_global_map: unit -> Obj.t val data_primitive_names: unit -> string - + val transl_const: Lambda.structured_constant -> Obj.t diff --git a/debian/patches/0009-Skip-native-tests.patch b/debian/patches/0009-Skip-native-tests.patch deleted file mode 100644 index c74fd6c5..00000000 --- a/debian/patches/0009-Skip-native-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/testsuite/tests/lib-dynlink-csharp/Makefile -+++ b/testsuite/tests/lib-dynlink-csharp/Makefile -@@ -31,7 +31,9 @@ - prepare: - @if $(SUPPORTS_SHARED_LIBRARIES); then \ - $(OCAMLC) -c plugin.ml && \ -- $(OCAMLOPT) -o plugin.cmxs -shared plugin.ml; \ -+ if $(BYTECODE_ONLY) ; then : ; else \ -+ $(OCAMLOPT) -o plugin.cmxs -shared plugin.ml; \ -+ fi; \ - fi - - .PHONY: bytecode ---- a/testsuite/tests/link-test/Makefile -+++ b/testsuite/tests/link-test/Makefile -@@ -14,7 +14,13 @@ - #* * - #************************************************************************** - --default: byte native -+default: -+ @$(MAKE) byte -+ @if $(BYTECODE_ONLY) ; then \ -+ echo " ... testing 'test.reference': => skipped"; \ -+ else \ -+ $(MAKE) native; \ -+ fi - - native: - @printf " ... testing native 'test.reference':" diff --git a/debian/patches/0010-arm-default-PIC.patch b/debian/patches/0010-arm-default-PIC.patch index 9480339a..98a60a01 100644 --- a/debian/patches/0010-arm-default-PIC.patch +++ b/debian/patches/0010-arm-default-PIC.patch @@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ let runtime_variant = ref "";; (* -runtime-variant *) --- a/man/ocamlopt.m +++ b/man/ocamlopt.m -@@ -702,10 +702,10 @@ +@@ -739,10 +739,10 @@ Select the floating-point hardware .TP .B \-fPIC diff --git a/debian/patches/series b/debian/patches/series index c7d67535..e7b9ccec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,7 @@ 0003-Don-t-use-rpath.patch 0004-Put-manpages-in-section-3o-instead-of-3.patch 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch -0006-Embed-bytecode-in-C-object-when-using-custom.patch +# TODO: need to patch again +#0006-Embed-bytecode-in-C-object-when-using-custom.patch 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch -0009-Skip-native-tests.patch 0010-arm-default-PIC.patch -- 2.30.2