diff options
| author | Maxim Yurchuk <maxim-yurchuk@ydb.tech> | 2024-10-18 20:31:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-18 20:31:38 +0300 |
| commit | 2a74bac2d2d3bccb4e10120f1ead805640ec9dd0 (patch) | |
| tree | 047e4818ced5aaf73f58517629e5260b5291f9f0 /contrib/tools/bison | |
| parent | 2d9656823e9521d8c29ea4c9a1d0eab78391abfc (diff) | |
| parent | 3d834a1923bbf9403cd4a448e7f32b670aa4124f (diff) | |
| download | ydb-2a74bac2d2d3bccb4e10120f1ead805640ec9dd0.tar.gz | |
Merge pull request #10502 from ydb-platform/mergelibs-241016-1210
Library import 241016-1210
Diffstat (limited to 'contrib/tools/bison')
| -rw-r--r-- | contrib/tools/bison/patches/darwin-extern-environ.patch | 4 | ||||
| -rw-r--r-- | contrib/tools/bison/patches/disable-includes.patch | 4 | ||||
| -rw-r--r-- | contrib/tools/bison/patches/missing-include.patch | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/tools/bison/patches/darwin-extern-environ.patch b/contrib/tools/bison/patches/darwin-extern-environ.patch index 01f3832ae3..b8bc924df9 100644 --- a/contrib/tools/bison/patches/darwin-extern-environ.patch +++ b/contrib/tools/bison/patches/darwin-extern-environ.patch @@ -1,5 +1,5 @@ ---- contrib/tools/bison/lib/spawn-pipe.c (index) -+++ contrib/tools/bison/lib/spawn-pipe.c (working tree) +--- a/lib/spawn-pipe.c (index) ++++ b/lib/spawn-pipe.c (working tree) @@ -53,7 +53,10 @@ # include <spawn.h> diff --git a/contrib/tools/bison/patches/disable-includes.patch b/contrib/tools/bison/patches/disable-includes.patch index 6be16cb54e..3650e4adca 100644 --- a/contrib/tools/bison/patches/disable-includes.patch +++ b/contrib/tools/bison/patches/disable-includes.patch @@ -1,5 +1,5 @@ ---- contrib/tools/bison/lib/obstack.c (index) -+++ contrib/tools/bison/lib/obstack.c (working tree) +--- a/lib/obstack.c (index) ++++ b/lib/obstack.c (working tree) @@ -51,10 +51,6 @@ /* If GCC, or if an oddball (testing?) host that #defines __alignof__, use the already-supplied __alignof__. Otherwise, this must be Gnulib diff --git a/contrib/tools/bison/patches/missing-include.patch b/contrib/tools/bison/patches/missing-include.patch index 789c41142f..b43cc07c19 100644 --- a/contrib/tools/bison/patches/missing-include.patch +++ b/contrib/tools/bison/patches/missing-include.patch @@ -1,5 +1,5 @@ ---- contrib/tools/bison/lib/hard-locale.c (index) -+++ contrib/tools/bison/lib/hard-locale.c (working tree) +--- a/lib/hard-locale.c (index) ++++ b/lib/hard-locale.c (working tree) @@ -19,6 +19,7 @@ #include <config.h> |