diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-05-08 19:38:48 -0700 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-06-20 06:29:44 -0700 |
| commit | 502e5a8f51a09a31d41fac4e977826eb6b3f870b (patch) | |
| tree | c0b406a6011a05f5f2f196a0af53baf3501acfc5 /meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch | |
| parent | 3c7d9c28ac4f65abbf75c2925652270ca397c54e (diff) | |
| download | poky-502e5a8f51a09a31d41fac4e977826eb6b3f870b.tar.gz | |
zip: Fix build with gcc-14
zip's configure fails to link this piece of test code:
int main() { return closedir(opendir(".")); }
with GCC-14 because it now treats implicit declaration of function
as error, unline older GCC version where it was just a warning
and this test would build fine.
Remove 0002-unix.c-Do-not-redefine-DIR-as-FILE.patch which
is now unnecessary.
(From OE-Core rev: 82d58f8bf63d6af80b5a4ad03d5121f1541ae15d)
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3422411eb750c7e960b81676637cfb321dbadefb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch')
| -rw-r--r-- | meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch deleted file mode 100644 index a86e03e620..0000000000 --- a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 10 Aug 2022 17:19:38 -0700 | ||
| 4 | Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE | ||
| 5 | |||
| 6 | DIR is already provided on Linux via | ||
| 7 | /usr/include/dirent.h system header | ||
| 8 | |||
| 9 | Upstream-Status: Inactive-Upstream | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | unix/unix.c | 2 -- | ||
| 13 | 1 file changed, 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/unix/unix.c b/unix/unix.c | ||
| 16 | index ba87614..6e6f4d2 100644 | ||
| 17 | --- a/unix/unix.c | ||
| 18 | +++ b/unix/unix.c | ||
| 19 | @@ -61,13 +61,11 @@ local time_t label_utim = 0; | ||
| 20 | /* Local functions */ | ||
| 21 | local char *readd OF((DIR *)); | ||
| 22 | |||
| 23 | - | ||
| 24 | #ifdef NO_DIR /* for AT&T 3B1 */ | ||
| 25 | #include <sys/dir.h> | ||
| 26 | #ifndef dirent | ||
| 27 | # define dirent direct | ||
| 28 | #endif | ||
| 29 | -typedef FILE DIR; | ||
| 30 | /* | ||
| 31 | ** Apparently originally by Rich Salz. | ||
| 32 | ** Cleaned up and modified by James W. Birdsall. | ||
| 33 | -- | ||
| 34 | 2.37.1 | ||
| 35 | |||
