From: Stephane Glondu Date: Tue, 21 Dec 2021 13:03:33 +0000 (+0100) Subject: Refresh patches X-Git-Tag: archive/raspbian/4.13.1-3+rpi1~2^2~25 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b65e76225593feca09bd6dd508a7d3735987e472;p=ocaml.git Refresh patches --- diff --git a/debian/patches/0001-Don-t-use-rpath.patch b/debian/patches/0001-Don-t-use-rpath.patch index 7bc167d5..a171d0c0 100644 --- a/debian/patches/0001-Don-t-use-rpath.patch +++ b/debian/patches/0001-Don-t-use-rpath.patch @@ -7,10 +7,10 @@ Subject: Don't use rpath 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.ml b/tools/ocamlmklib.ml -index d5bb84c..ab3ca2b 100644 +index 0ca7b80..e50ea0e 100644 --- a/tools/ocamlmklib.ml +++ b/tools/ocamlmklib.ml -@@ -58,6 +58,11 @@ and rpath = ref [] (* rpath options *) +@@ -57,6 +57,11 @@ and rpath = ref [] (* rpath options *) and debug = ref false (* -g option *) and verbose = ref false diff --git a/debian/patches/0002-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0002-Put-manpages-in-section-3o-instead-of-3.patch deleted file mode 100644 index 8588c8d6..00000000 --- a/debian/patches/0002-Put-manpages-in-section-3o-instead-of-3.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Julien Cristau -Date: Tue, 19 May 2009 17:24:52 +0200 -Subject: Put manpages in section 3o instead of 3 - ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index 6b7093b..026d409 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -416,7 +416,7 @@ stdlib_man/Stdlib.3o: $(OCAMLDOC) $(DOC_ALL) - $(OCAMLDOC_RUN) -man -d stdlib_man -nostdlib \ - -hide Stdlib -lib Stdlib $(DOC_ALL_INCLUDES) \ - -pp "$(AWK) -v ocamldoc=true -f $(SRC)/stdlib/expand_module_aliases.awk" \ -- -t "OCaml library" -man-mini \ -+ -t "OCaml library" -man-mini -man-section 3o \ - $(DOC_ALL_TEXT:%=-text %) \ - $(DOC_ALL_MLIS) - diff --git a/debian/patches/0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch b/debian/patches/0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch index 9a9d1a39..589f4648 100644 --- a/debian/patches/0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch +++ b/debian/patches/0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch @@ -10,17 +10,16 @@ benefit from using hardening link flags, such as -Wl,-z,relro. Origin: other Bug-Debian: https://bugs.debian.org/702349 Forwarded: no -Last-Update: <2019-07-22> +Last-Update: <2021-12-21> --- - configure.ac | 3 +++ - tools/Makefile | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index aa5f26f..069fe96 100644 +index 3698c7c..ac8a080 100644 --- a/configure.ac +++ b/configure.ac -@@ -831,6 +831,9 @@ AS_IF([test x"$enable_shared" != "xno"], +@@ -984,6 +984,9 @@ AS_IF([test x"$enable_shared" != "xno"], natdynlinkopts="-Wl,-E" shared_libraries_supported=true])]) @@ -30,16 +29,3 @@ index aa5f26f..069fe96 100644 AS_IF([test -z "$mkmaindll"], [mkmaindll=$mksharedlib]) # Configure native dynlink -diff --git a/tools/Makefile b/tools/Makefile -index dbad0b7..b4adcff 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -276,7 +276,7 @@ DEF_SYMBOL_PREFIX = '-Dsymbol_prefix="_"' - endif - - objinfo_helper$(EXE): objinfo_helper.$(O) -- $(CC) $(BFD_LDFLAGS) $(OC_CFLAGS) $(OUTPUTEXE)$@ $< $(BFD_LDLIBS) -+ $(CC) $(BFD_LDFLAGS) $(OC_CFLAGS) $(OUTPUTEXE)$@ $< $(BFD_LDLIBS) $(CCLINKFLAGS) - - objinfo_helper.$(O): $(ROOTDIR)/runtime/caml/s.h - diff --git a/debian/patches/0005-read_main_debug_info-do-not-die-in-custom-executable.patch b/debian/patches/0005-read_main_debug_info-do-not-die-in-custom-executable.patch deleted file mode 100644 index a9c21783..00000000 --- a/debian/patches/0005-read_main_debug_info-do-not-die-in-custom-executable.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Stephane Glondu -Date: Thu, 30 Jan 2020 13:06:08 +0100 -Subject: read_main_debug_info: do not die in -custom executables - -This fatal error occurred with some executables linked with -custom -(with the Debian-specific patch), notably ppx preprocessors during the -build of ppxlib. ---- - runtime/backtrace_byt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/backtrace_byt.c b/runtime/backtrace_byt.c -index 28fe44c..88e10fc 100644 ---- a/runtime/backtrace_byt.c -+++ b/runtime/backtrace_byt.c -@@ -378,7 +378,7 @@ static void read_main_debug_info(struct debug_info *di) - - fd = caml_attempt_open(&exec_name, &trail, 1); - if (fd < 0){ -- caml_fatal_error ("executable program file not found"); -+ /* caml_fatal_error ("executable program file not found"); */ - CAMLreturn0; - } - diff --git a/debian/patches/0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch b/debian/patches/0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch index 9c306374..82672813 100644 --- a/debian/patches/0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch +++ b/debian/patches/0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch @@ -8,10 +8,10 @@ Bug: https://github.com/ocaml/ocaml/issues/9800 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac -index 069fe96..ab1e188 100644 +index ac8a080..9ac019f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1018,6 +1018,16 @@ AS_CASE([$arch], +@@ -1183,6 +1183,16 @@ AS_CASE([$arch], [common_cflags="-no-pie $common_cflags"], [])]) @@ -27,4 +27,4 @@ index 069fe96..ab1e188 100644 + # Assembler - AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""]) + AS_IF([test -n "$target_alias"], diff --git a/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch b/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch index 3d7c0131..186d4c61 100644 --- a/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch +++ b/debian/patches/0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch @@ -7,21 +7,21 @@ Subject: Trigger -output-complete-exe on -custom with an environment variable 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/driver/main_args.ml b/driver/main_args.ml -index 5c28ded..81f203d 100644 +index 3c6faac..a208056 100644 --- a/driver/main_args.ml +++ b/driver/main_args.ml -@@ -1962,7 +1962,6 @@ third-party libraries such as Lwt, but with a different API." +@@ -1976,7 +1976,6 @@ third-party libraries such as Lwt, but with a different API." include Core include Compiler let _compat_32 = set bytecode_compatible_32 - let _custom = set custom_runtime let _dcamlprimc = set keep_camlprimc_file let _dinstr = set dump_instr - let _dllib s = defer (ProcessDLLs (Misc.rev_split_words s)) -@@ -1981,6 +1980,15 @@ third-party libraries such as Lwt, but with a different API." + let _dllib s = Compenv.defer (ProcessDLLs (Misc.rev_split_words s)) +@@ -1995,6 +1994,15 @@ third-party libraries such as Lwt, but with a different API." let _use_runtime s = use_runtime := s - let _v () = print_version_and_library "compiler" - let _vmthread () = fatal vmthread_removed_message + let _v () = Compenv.print_version_and_library "compiler" + let _vmthread () = Compenv.fatal vmthread_removed_message + let _custom () = + if + match Sys.getenv_opt "OCAML_CUSTOM_USE_OUTPUT_COMPLETE_EXE" with diff --git a/debian/patches/0008-Statically-link-lib-bfd-iberty.patch b/debian/patches/0008-Statically-link-lib-bfd-iberty.patch deleted file mode 100644 index 97f1c4c4..00000000 --- a/debian/patches/0008-Statically-link-lib-bfd-iberty.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stephane Glondu -Date: Fri, 4 Sep 2020 06:23:06 +0200 -Subject: Statically link lib{bfd,iberty} - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index ab1e188..b3ebe74 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1680,6 +1680,10 @@ AS_IF([test x"$with_bfd" != "xno"], - 'ocamlobjinfo' will be unable to display info on .cmxs files. - ]))]) - -+## Statically link libbfd and libiberty to avoid a versioned dependency -+## too constrained on libbinutils -+bfd_ldlibs="$(echo $bfd_ldlibs | sed 's/-lbfd/-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic -lz -ldl/')" -+ - ## Does the assembler support debug prefix map and CFI directives - as_has_debug_prefix_map=false - asm_cfi_supported=false diff --git a/debian/patches/0009-Do-not-error-on-warnings-in-autoconf.patch b/debian/patches/0009-Do-not-error-on-warnings-in-autoconf.patch index d322afd7..1ab0494c 100644 --- a/debian/patches/0009-Do-not-error-on-warnings-in-autoconf.patch +++ b/debian/patches/0009-Do-not-error-on-warnings-in-autoconf.patch @@ -8,15 +8,15 @@ Bug-Debian: https://bugs.debian.org/978875 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/autogen b/tools/autogen -index 8c85c2c..efc17dd 100755 +index 5341451..7ac2349 100755 --- a/tools/autogen +++ b/tools/autogen @@ -16,7 +16,7 @@ # Remove the autom4te.cache directory to make sure we start in a clean state rm -rf autom4te.cache --autoconf --force --warnings=all,error -+autoconf --force --warnings=all +-${1-autoconf} --force --warnings=all,error ++${1-autoconf} --force --warnings=all # Allow pre-processing of configure arguments for Git check-outs # The sed call removes dra27's copyright on the whole configure script... diff --git a/debian/patches/series b/debian/patches/series index cbb4715d..ade6c922 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,6 @@ 0001-Don-t-use-rpath.patch -0002-Put-manpages-in-section-3o-instead-of-3.patch 0003-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch 0004-Check-for-definition-of-AT_SECURE-before-using-it.patch -0005-read_main_debug_info-do-not-die-in-custom-executable.patch 0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch 0007-Trigger-output-complete-exe-on-custom-with-an-enviro.patch -0008-Statically-link-lib-bfd-iberty.patch 0009-Do-not-error-on-warnings-in-autoconf.patch