--- /dev/null
+From: Julien Cristau <julien.cristau@ens-lyon.org>
+Date: Tue, 19 May 2009 17:24:52 +0200
+Subject: Put manpages in section 3o instead of 3
+
+---
+ api_docgen/ocamldoc/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile
+index 5b1f894..71f5a70 100644
+--- a/api_docgen/ocamldoc/Makefile
++++ b/api_docgen/ocamldoc/Makefile
+@@ -61,6 +61,7 @@ build/libref/%.odoc: build/%.mld | build/libref
+ ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
+ build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
+ $(V_OCAMLDOC)$(OCAMLDOC_RUN) -man -d build/man -man-mini \
++ -man-section 3o \
+ -nostdlib -hide Stdlib -lib Stdlib -t "OCaml library" \
+ $(addprefix -load , $(ALL_COMPILED_DOC))
+
--- /dev/null
+From: Stephane Glondu <steph@glondu.net>
+Date: Thu, 3 Sep 2020 15:21:10 +0200
+Subject: Trigger -output-complete-exe on -custom with an environment variable
+
+---
+ driver/main_args.ml | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/driver/main_args.ml b/driver/main_args.ml
+index ea07d15..7972427 100644
+--- a/driver/main_args.ml
++++ b/driver/main_args.ml
+@@ -1920,7 +1920,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 = Compenv.defer (ProcessDLLs (Misc.rev_split_words s))
+@@ -1939,6 +1938,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
++ let _custom () =
++ if
++ match Sys.getenv_opt "OCAML_CUSTOM_USE_OUTPUT_COMPLETE_EXE" with
++ | None | Some "" -> false
++ | Some _ -> true
++ then
++ _output_complete_exe ()
++ else
++ set custom_runtime ()
+ end
+
+ end
+++ /dev/null
-From: Torok Edwin <edwin@etorok.net>
-Date: Wed, 15 Jul 2015 16:33:23 +0300
-Subject: Use CCLINKFLAGS for linking all executables and shared libraries
-
-This allows packagers to set additional linker flags for executables and shared
-libraries created by OCaml, and for the OCaml tools themselves.
-OCaml code can be linked with various C stubs and C libraries that would
-benefit from using hardening link flags, such as -Wl,-z,relro.
-
-Origin: other
-Bug-Debian: https://bugs.debian.org/702349
-Forwarded: no
-Last-Update: <2021-12-21>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 64e6d7e..4d94dc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1353,6 +1353,10 @@ AS_CASE([$host],
- [oc_ldflags="$oc_ldflags -Wl,-z,nobtcfi"
- natdynlinkopts="$natdynlinkopts -Wl,-z,nobtcfi"])
-
-+# Use CCLINKFLAGS for linking all executables and shared libraries
-+
-+mksharedlib="$mksharedlib $CCLINKFLAGS"
-+mkexe="$mkexe $CCLINKFLAGS"
-
- # Configure native dynlink
-
+++ /dev/null
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 24 Jul 2019 09:08:39 +0200
-Subject: Check for definition of AT_SECURE before using it
-
-This fixes compilation on kfreebsd-*.
-
-Forwarded: https://github.com/ocaml/ocaml/pull/8842
----
- otherlibs/unix/envir_unix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/otherlibs/unix/envir_unix.c b/otherlibs/unix/envir_unix.c
-index cef6cb0..977db1c 100644
---- a/otherlibs/unix/envir_unix.c
-+++ b/otherlibs/unix/envir_unix.c
-@@ -39,7 +39,7 @@ CAMLprim value caml_unix_environment_unsafe(value unit)
-
- static char **secure_environ(void)
- {
--#ifdef HAS_GETAUXVAL
-+#if defined(HAS_GETAUXVAL) && defined(AT_SECURE)
- if (!getauxval(AT_SECURE))
- return environ;
- else
--- /dev/null
+From: Stephane Glondu <steph@glondu.net>
+Date: Thu, 25 Nov 2021 15:01:11 +0100
+Subject: Do not error on warnings in autoconf
+
+Bug-Debian: https://bugs.debian.org/978875
+---
+ tools/autogen | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/autogen b/tools/autogen
+index cd9f6d2..7fd2f92 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
+
+-${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...
+++ /dev/null
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 29 Jul 2020 16:22:39 +0200
-Subject: Disable DT_TEXTREL warnings on Linux i386
-
-Bug: https://github.com/ocaml/ocaml/issues/9800
----
- configure.ac | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4d94dc6..af1ea7b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1608,6 +1608,16 @@ AS_CASE([$arch],
- # Alpine and other musl-based Linux distributions
- [common_cflags="-no-pie $common_cflags"])])
-
-+# Disable DT_TEXTREL warnings on Linux i386
-+# See https://github.com/ocaml/ocaml/issues/9800
-+
-+AS_CASE([$host],
-+ [i?86-*-linux-*],
-+ [common_cflags="-Wl,-z,notext $common_cflags"
-+ mksharedlib="$mksharedlib -Wl,-z,notext"
-+ mkmaindll="$mkmaindll -Wl,-z,notext"],
-+ [])
-+
- # Assembler
-
- AS_IF([test -n "$target_alias"],
--- /dev/null
+From: Torok Edwin <edwin@etorok.net>
+Date: Wed, 15 Jul 2015 16:33:23 +0300
+Subject: Use CCLINKFLAGS for linking all executables and shared libraries
+
+This allows packagers to set additional linker flags for executables and shared
+libraries created by OCaml, and for the OCaml tools themselves.
+OCaml code can be linked with various C stubs and C libraries that would
+benefit from using hardening link flags, such as -Wl,-z,relro.
+
+Origin: other
+Bug-Debian: https://bugs.debian.org/702349
+Forwarded: no
+Last-Update: <2021-12-21>
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 64e6d7e..4d94dc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1353,6 +1353,10 @@ AS_CASE([$host],
+ [oc_ldflags="$oc_ldflags -Wl,-z,nobtcfi"
+ natdynlinkopts="$natdynlinkopts -Wl,-z,nobtcfi"])
+
++# Use CCLINKFLAGS for linking all executables and shared libraries
++
++mksharedlib="$mksharedlib $CCLINKFLAGS"
++mkexe="$mkexe $CCLINKFLAGS"
+
+ # Configure native dynlink
+
--- /dev/null
+From: Stephane Glondu <steph@glondu.net>
+Date: Wed, 24 Jul 2019 09:08:39 +0200
+Subject: Check for definition of AT_SECURE before using it
+
+This fixes compilation on kfreebsd-*.
+
+Forwarded: https://github.com/ocaml/ocaml/pull/8842
+---
+ otherlibs/unix/envir_unix.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/otherlibs/unix/envir_unix.c b/otherlibs/unix/envir_unix.c
+index cef6cb0..977db1c 100644
+--- a/otherlibs/unix/envir_unix.c
++++ b/otherlibs/unix/envir_unix.c
+@@ -39,7 +39,7 @@ CAMLprim value caml_unix_environment_unsafe(value unit)
+
+ static char **secure_environ(void)
+ {
+-#ifdef HAS_GETAUXVAL
++#if defined(HAS_GETAUXVAL) && defined(AT_SECURE)
+ if (!getauxval(AT_SECURE))
+ return environ;
+ else
+++ /dev/null
-From: Stephane Glondu <steph@glondu.net>
-Date: Thu, 3 Sep 2020 15:21:10 +0200
-Subject: Trigger -output-complete-exe on -custom with an environment variable
-
----
- driver/main_args.ml | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/driver/main_args.ml b/driver/main_args.ml
-index ea07d15..7972427 100644
---- a/driver/main_args.ml
-+++ b/driver/main_args.ml
-@@ -1920,7 +1920,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 = Compenv.defer (ProcessDLLs (Misc.rev_split_words s))
-@@ -1939,6 +1938,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
-+ let _custom () =
-+ if
-+ match Sys.getenv_opt "OCAML_CUSTOM_USE_OUTPUT_COMPLETE_EXE" with
-+ | None | Some "" -> false
-+ | Some _ -> true
-+ then
-+ _output_complete_exe ()
-+ else
-+ set custom_runtime ()
- end
-
- end
--- /dev/null
+From: Stephane Glondu <steph@glondu.net>
+Date: Wed, 29 Jul 2020 16:22:39 +0200
+Subject: Disable DT_TEXTREL warnings on Linux i386
+
+Bug: https://github.com/ocaml/ocaml/issues/9800
+---
+ configure.ac | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4d94dc6..af1ea7b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1608,6 +1608,16 @@ AS_CASE([$arch],
+ # Alpine and other musl-based Linux distributions
+ [common_cflags="-no-pie $common_cflags"])])
+
++# Disable DT_TEXTREL warnings on Linux i386
++# See https://github.com/ocaml/ocaml/issues/9800
++
++AS_CASE([$host],
++ [i?86-*-linux-*],
++ [common_cflags="-Wl,-z,notext $common_cflags"
++ mksharedlib="$mksharedlib -Wl,-z,notext"
++ mkmaindll="$mkmaindll -Wl,-z,notext"],
++ [])
++
+ # Assembler
+
+ AS_IF([test -n "$target_alias"],
+++ /dev/null
-From: Stephane Glondu <steph@glondu.net>
-Date: Thu, 25 Nov 2021 15:01:11 +0100
-Subject: Do not error on warnings in autoconf
-
-Bug-Debian: https://bugs.debian.org/978875
----
- tools/autogen | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/autogen b/tools/autogen
-index cd9f6d2..7fd2f92 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
-
--${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...
+++ /dev/null
-From: Julien Cristau <julien.cristau@ens-lyon.org>
-Date: Tue, 19 May 2009 17:24:52 +0200
-Subject: Put manpages in section 3o instead of 3
-
----
- api_docgen/ocamldoc/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile
-index 5b1f894..71f5a70 100644
---- a/api_docgen/ocamldoc/Makefile
-+++ b/api_docgen/ocamldoc/Makefile
-@@ -61,6 +61,7 @@ build/libref/%.odoc: build/%.mld | build/libref
- ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
- build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
- $(V_OCAMLDOC)$(OCAMLDOC_RUN) -man -d build/man -man-mini \
-+ -man-section 3o \
- -nostdlib -hide Stdlib -lib Stdlib -t "OCaml library" \
- $(addprefix -load , $(ALL_COMPILED_DOC))
-
-0002-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
-0003-Check-for-definition-of-AT_SECURE-before-using-it.patch
-0004-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
-0005-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
-0006-Do-not-error-on-warnings-in-autoconf.patch
-0007-Put-manpages-in-section-3o-instead-of-3.patch
+0001-Put-manpages-in-section-3o-instead-of-3.patch
+0002-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
+0003-Do-not-error-on-warnings-in-autoconf.patch
+0004-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+0005-Check-for-definition-of-AT_SECURE-before-using-it.patch
+0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
0007-Enable-native-backend-on-hurd-amd64.patch
projects / ocaml.git / commitdiff