Refresh patches

diff --git a/debian/patches/0001-Don-t-use-rpath.patch b/debian/patches/0001-Don-t-use-rpath.patch
index a171d0c037d8b76e066bb0a878c41e5754d98c30..3140fe940d8384be0a78ed52c5e85fa1de31a6a3 100644 (file)
--- 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 0ca7b80..e50ea0e 100644
+index 1cf8ef9..37c7f41 100644
 --- a/tools/ocamlmklib.ml
 +++ b/tools/ocamlmklib.ml
-@@ -57,6 +57,11 @@ and rpath = ref []          (* rpath options *)
+@@ -55,6 +55,11 @@ and rpath = ref []          (* rpath options *)
  and debug = ref false       (* -g option *)
  and verbose = ref false
  

diff --git a/debian/patches/0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch b/debian/patches/0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
index 589f4648e20ec8b71f4c0ef4a4fbee1319bd65f0..2b302460e709311154f1ae579a5829c139fbf66b 100644 (file)
--- a/debian/patches/0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+++ b/debian/patches/0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
@@ -16,12 +16,12 @@ Last-Update: <2021-12-21>
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 3698c7c..ac8a080 100644
+index ebb8bbd..d27d47b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -984,6 +984,9 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -987,6 +987,9 @@ AS_IF([test x"$enable_shared" != "xno"],
        natdynlinkopts="-Wl,-E"
-       shared_libraries_supported=true])])
+       supports_shared_libraries=true])])
  
 +mksharedlib="$mksharedlib $CCLINKFLAGS"
 +mkexe="$mkexe $CCLINKFLAGS"

diff --git a/debian/patches/0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch b/debian/patches/0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
index 8267281334bd6978d980f5b838ed1c275fb2ba37..a39bdb4e2598c369466c10a79c354adcb0886349 100644 (file)
--- a/debian/patches/0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
+++ b/debian/patches/0004-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 ac8a080..9ac019f 100644
+index d27d47b..48b438a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1183,6 +1183,16 @@ AS_CASE([$arch],
+@@ -1199,6 +1199,16 @@ AS_CASE([$arch],
         [common_cflags="-no-pie $common_cflags"],
      [])])
  

diff --git a/debian/patches/0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch b/debian/patches/0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
index 186d4c615e501ccabe6577d555baad5b32f250e5..3c72e99489c80c9020213bfca6c2b3c857f72c49 100644 (file)
--- a/debian/patches/0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
+++ b/debian/patches/0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
@@ -7,10 +7,10 @@ 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 3c6faac..a208056 100644
+index 60db017..a46e50e 100644
 --- a/driver/main_args.ml
 +++ b/driver/main_args.ml
-@@ -1976,7 +1976,6 @@ third-party libraries such as Lwt, but with a different API."
+@@ -2005,7 +2005,6 @@ third-party libraries such as Lwt, but with a different API."
      include Core
      include Compiler
      let _compat_32 = set bytecode_compatible_32
@@ -18,7 +18,7 @@ index 3c6faac..a208056 100644
      let _dcamlprimc = set keep_camlprimc_file
      let _dinstr = set dump_instr
      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."
+@@ -2024,6 +2023,15 @@ third-party libraries such as Lwt, but with a different API."
      let _use_runtime s = use_runtime := s
      let _v () = Compenv.print_version_and_library "compiler"
      let _vmthread () = Compenv.fatal vmthread_removed_message

diff --git a/debian/patches/0006-Do-not-error-on-warnings-in-autoconf.patch b/debian/patches/0006-Do-not-error-on-warnings-in-autoconf.patch
index 1ab0494cda4eafb95aabfae01b15090299e035fa..2f46a01bf2b56490358d40278efe3e7fedeb7a32 100644 (file)
--- a/debian/patches/0006-Do-not-error-on-warnings-in-autoconf.patch
+++ b/debian/patches/0006-Do-not-error-on-warnings-in-autoconf.patch
@@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/978875
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/autogen b/tools/autogen
-index 5341451..7ac2349 100755
+index 69cc910..41be702 100755
 --- a/tools/autogen
 +++ b/tools/autogen
 @@ -16,7 +16,7 @@

diff --git a/debian/patches/0007-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0007-Put-manpages-in-section-3o-instead-of-3.patch
index af33aeab85c4d25d2158e16f591ef04fa95c975f..3a1c700966ce1550a869314ef9d5936d6cdb0862 100644 (file)
--- a/debian/patches/0007-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0007-Put-manpages-in-section-3o-instead-of-3.patch
@@ -7,10 +7,10 @@ Subject: Put manpages in section 3o instead of 3
  1 file changed, 1 insertion(+)
 
 diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile
-index 87cd9cd..fa1dbad 100644
+index 6af89ab..d4f84ae 100644
 --- a/api_docgen/ocamldoc/Makefile
 +++ b/api_docgen/ocamldoc/Makefile
-@@ -60,6 +60,7 @@ build/libref/%.odoc: $(DOCGEN)/%.mld | build/libref
+@@ -62,6 +62,7 @@ build/libref/%.odoc: build/%.mld | build/libref
  ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
  build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
        $(OCAMLDOC_RUN) -man -d build/man -man-mini \

diff --git a/debian/patches/0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch b/debian/patches/0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch
index 0034748ebafadcf70a572bd4b676d03ac32a34c0..ceadbe107e8979691f36f4e123ef3d8b6ab28ae1 100644 (file)
--- a/debian/patches/0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch
+++ b/debian/patches/0008-Filter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9ac019f..a449246 100644
+index 48b438a..20f0873 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -43,7 +43,7 @@ libraries_man_section=3
+@@ -37,7 +37,7 @@ CONFIGURE_ARGS="$*"
  # at the moment they are not taken into account on Windows, because
  # flexlink, which is used to build executables on this platform, can
  # not handle them.
@@ -21,7 +21,7 @@ index 9ac019f..a449246 100644
  
  # Flags for building executable files with debugging symbols
  mkexedebugflag="-g"
-@@ -1952,7 +1952,7 @@ AS_IF([test x"$DEFAULT_STRING" = "xunsafe"],
+@@ -1980,7 +1980,7 @@ AS_IF([test x"$DEFAULT_STRING" = "xunsafe"],
  
  oc_cflags="$common_cflags $internal_cflags"
  oc_cppflags="$common_cppflags $internal_cppflags"