From dd1593118f38353349b67c8cebfeed190f773666 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Glondu?= Date: Mon, 18 Sep 2023 13:38:34 +0200 Subject: [PATCH] Refresh patches --- debian/patches/0001-Don-t-use-rpath.patch | 4 ++-- ...e-CCLINKFLAGS-for-linking-all-executables-and-shar.patch | 6 +++--- .../0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch | 4 ++-- ...igger-output-complete-exe-on-custom-with-an-enviro.patch | 6 +++--- .../patches/0006-Do-not-error-on-warnings-in-autoconf.patch | 2 +- .../0007-Put-manpages-in-section-3o-instead-of-3.patch | 4 ++-- ...lter-out-f-debug-file-prefix-map-from-ocamlc_cflag.patch | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/patches/0001-Don-t-use-rpath.patch b/debian/patches/0001-Don-t-use-rpath.patch index a171d0c0..3140fe94 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 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 589f4648..2b302460 100644 --- 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 82672813..a39bdb4e 100644 --- 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 186d4c61..3c72e994 100644 --- 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 1ab0494c..2f46a01b 100644 --- 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 af33aeab..3a1c7009 100644 --- 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 0034748e..ceadbe10 100644 --- 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" -- 2.30.2