-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22264 from MisterDA/ocaml49-gcc112-ter
Add patches to ocaml-variants 4.09 to fix compilation with gcc 11.2
- Loading branch information
Showing
28 changed files
with
1,722 additions
and
14 deletions.
There are no files selected for viewing
119 changes: 119 additions & 0 deletions
119
packages/ocaml-variants/ocaml-variants.4.09.1+32bit/files/0001-Re-generate-configure.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 | ||
| From: Louis Gesbert <[email protected]> | ||
| 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 <[email protected]>. | ||
| # | ||
| @@ -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='[email protected]' | ||
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
...s/ocaml-variants/ocaml-variants.4.09.1+afl+flambda/files/0001-Re-generate-configure.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 | ||
| From: Louis Gesbert <[email protected]> | ||
| 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 <[email protected]>. | ||
| # | ||
| @@ -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='[email protected]' | ||
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
packages/ocaml-variants/ocaml-variants.4.09.1+afl/files/0001-Re-generate-configure.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| From 08cf969ee4d728e60bbda3113e95c52b2637d2b7 Mon Sep 17 00:00:00 2001 | ||
| From: Louis Gesbert <[email protected]> | ||
| 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 <[email protected]>. | ||
| # | ||
| @@ -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='[email protected]' | ||
| 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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.