From 72b2e5fd6572afa9ec71227d28505b7fe2c842a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Fri, 14 Oct 2022 09:25:37 +0200 Subject: [PATCH] Add patches to ocaml-variants 4.09 to fix compilation with gcc 11.2 Follow-up to 9d1dfdcd28ab617f41a962895d5f284fe15b86dc where ocaml-variants was forgotten. --- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+32bit/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+afl+flambda/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+afl/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+bytecode-only/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+flambda/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+fp+flambda/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+fp/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+musl+flambda/opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../opam | 5 +- .../files/0001-Re-generate-configure.patch | 119 ++++++++++++++++++ .../ocaml-variants.4.09.1+spacetime/opam | 5 +- 28 files changed, 1722 insertions(+), 14 deletions(-) create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+32bit/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+afl/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+flambda/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+fp/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/files/0001-Re-generate-configure.patch create mode 100644 packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/files/0001-Re-generate-configure.patch diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/opam index 7e496074bad..a6024dd1ba5 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+32bit/opam @@ -55,8 +55,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/opam index c6d060b3ce2..f8f279a76b4 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/opam @@ -44,8 +44,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+afl/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+afl/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+afl/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+afl/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+afl/opam index 7d3ecb2211b..42d3a60b78f 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+afl/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+afl/opam @@ -43,8 +43,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/opam index ed5b42498dc..439640d0c6f 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+bytecode-only/opam @@ -42,8 +42,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/opam index a501102681d..fa6e5fc2c81 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+default-unsafe-string/opam @@ -44,8 +44,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/opam index 93f80bd26fb..d333268473f 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda+no-flat-float-array/opam @@ -46,8 +46,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/opam index cc7cba7033a..cdc3d212b1d 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+flambda/opam @@ -43,8 +43,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/opam index ede87dcbe9d..29ad8cfc085 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+force-safe-string/opam @@ -44,8 +44,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/opam index 9c10b39df9b..900aef8d6f3 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+fp+flambda/opam @@ -46,8 +46,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+fp/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+fp/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+fp/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+fp/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+fp/opam index b4a2e6c5fa8..9d9d95b77f3 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+fp/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+fp/opam @@ -43,8 +43,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/opam index 705c9455314..e5879ad07a8 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+flambda/opam @@ -50,8 +50,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/opam index a81bb3ce88c..058a771203d 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+musl+static+flambda/opam @@ -53,8 +53,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/opam index 5cc5bb24edb..94dc434a6af 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+no-flat-float-array/opam @@ -44,8 +44,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +] diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/files/0001-Re-generate-configure.patch b/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/files/0001-Re-generate-configure.patch new file mode 100644 index 00000000000..7921faede54 --- /dev/null +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/files/0001-Re-generate-configure.patch @@ -0,0 +1,119 @@ +From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 +From: Louis Gesbert +Date: Wed, 13 Jul 2022 11:23:51 +0200 +Subject: [PATCH] Re-generate configure + +to turn off -Werror ; see https://github.com/ocaml/opam-repository/pull/21630 +--- + configure | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index d9cc166e0e..1a760cc179 100755 +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for OCaml 4.09.1+dev1-2020-03-13. ++# Generated by GNU Autoconf 2.69 for OCaml 4.09.1. + # + # Report bugs to . + # +@@ -590,8 +590,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='OCaml' + PACKAGE_TARNAME='ocaml' +-PACKAGE_VERSION='4.09.1+dev1-2020-03-13' +-PACKAGE_STRING='OCaml 4.09.1+dev1-2020-03-13' ++PACKAGE_VERSION='4.09.1' ++PACKAGE_STRING='OCaml 4.09.1' + PACKAGE_BUGREPORT='caml-list@inria.fr' + PACKAGE_URL='http://www.ocaml.org' + +@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures OCaml 4.09.1+dev1-2020-03-13 to adapt to many kinds of systems. ++\`configure' configures OCaml 4.09.1 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1484,7 +1484,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of OCaml 4.09.1+dev1-2020-03-13:";; ++ short | recursive ) echo "Configuration of OCaml 4.09.1:";; + esac + cat <<\_ACEOF + +@@ -1642,7 +1642,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-OCaml configure 4.09.1+dev1-2020-03-13 ++OCaml configure 4.09.1 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -2305,7 +2305,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++It was created by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -2654,8 +2654,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&5 +-$as_echo "$as_me: Configuring OCaml version 4.09.1+dev1-2020-03-13" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.09.1" >&5 ++$as_echo "$as_me: Configuring OCaml version 4.09.1" >&6;} + + # Configuration variables + +@@ -2730,7 +2730,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + ## Output variables + + +-VERSION=4.09.1+dev1-2020-03-13 ++VERSION=4.09.1 + + + # Note: This is present for the flexdll bootstrap where it exposed as the old +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : +@@ -17200,7 +17200,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by OCaml $as_me 4.09.1+dev1-2020-03-13, which was ++This file was extended by OCaml $as_me 4.09.1, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17267,7 +17267,7 @@ _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ +-OCaml config.status 4.09.1+dev1-2020-03-13 ++OCaml config.status 4.09.1 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-- +2.35.1 + diff --git a/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/opam b/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/opam index 8311d3ed51d..b09b3e35a27 100644 --- a/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/opam +++ b/packages/ocaml-variants/ocaml-variants.4.09.1+spacetime/opam @@ -43,8 +43,11 @@ post-messages: [ ] available: !(os = "macos" & arch = "arm64") license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -patches: ["alt-signal-stack.patch"] +patches: ["alt-signal-stack.patch" "0001-Re-generate-configure.patch"] extra-source "alt-signal-stack.patch" { src: "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch" checksum: "sha256=a76506f98450971c954d9322344da592dbf1c38e5bca91ec75c4f9c2889ba637" } +extra-files: [ + ["0001-Re-generate-configure.patch" "md5=3e01b702dcdce9e5fc41f7eb66290501"] +]