diff options
| author |   Sam James <sam@gentoo.org> | 2022-11-18 01:01:13 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-11-18 01:02:05 +0000 |
| commit | 541ccf270b9b9b5631072a654cd3add5ccd433e7 (patch) | |
| tree | 47f74d0d7ad3eb211e075f4ce4ae216cff0ba7d6 /sys-devel | |
| parent | sys-devel/autoconf: backport further Clang 16 fixes (2.71) (diff) | |
| download | gentoo-541ccf270b9b9b5631072a654cd3add5ccd433e7.tar.gz gentoo-541ccf270b9b9b5631072a654cd3add5ccd433e7.tar.bz2 gentoo-541ccf270b9b9b5631072a654cd3add5ccd433e7.zip | |
sys-devel/autoconf: backport further Clang 16 fixes (2.69)
It turns out we had some of these fixes already in our 2.69 from
previous backporting work which ended up catching stuff which wasn't actually
applied upstream yet, so the patch change here is much smaller than for 2.71.
Bug: https://bugs.gentoo.org/870412
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/autoconf/autoconf-2.69-r8.ebuild (renamed from sys-devel/autoconf/autoconf-2.69-r7.ebuild) | 0 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch | 29 |
2 files changed, 29 insertions, 0 deletions
diff --git a/sys-devel/autoconf/autoconf-2.69-r7.ebuild b/sys-devel/autoconf/autoconf-2.69-r8.ebuild index 091517d7d6b2..091517d7d6b2 100644 --- a/sys-devel/autoconf/autoconf-2.69-r7.ebuild +++ b/sys-devel/autoconf/autoconf-2.69-r8.ebuild diff --git a/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch b/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch index 9f16bc93adba..77444ebc5be6 100644 --- a/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch +++ b/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch @@ -1,5 +1,6 @@ https://bugs.gentoo.org/870412 https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b +(and contains a backport of https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4) Backport the K&R decls fix to 2.69 to avoid configure tests failing (often "silently", i.e. doesn't fail the build of @@ -363,3 +364,31 @@ Subject: [PATCH] backport K&R decl fixes #define mymacro1(arg) arg #define mymacro2]]) # The difference in space-before-open-paren is intentional. +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -1106,9 +1106,7 @@ struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; ++static char *e (char **p, int i) + { + return p[i]; + } +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -251,10 +251,9 @@ AC_INCLUDES_DEFAULT + /* Some platforms explicitly require an extern "C" signal handler + when using C++. */ + #ifdef __cplusplus +-extern "C" void ucatch (int dummy) { } +-#else +-void ucatch (dummy) int dummy; { } ++extern "C" + #endif ++void ucatch (int dummy) { } + + int + main (void) |