From 2f638e51e602982648087e00c788a4751f1a4a8c Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 17 Jan 2024 21:30:04 -0500 Subject: [PATCH] gl-patches: Don't force HAVE_LONG_LONG_INT. Gnulib nowadays just assumes long long works but forces these definitions, it doesn't actually need them set so it is just pointless at best. --- m4/gl-patches.m4 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/m4/gl-patches.m4 b/m4/gl-patches.m4 index f16dd1b..b30f62c 100644 --- a/m4/gl-patches.m4 +++ b/m4/gl-patches.m4 @@ -1,4 +1,4 @@ -# Copyright © 2023 Nick Bowler +# Copyright © 2023-2024 Nick Bowler # # Monkey patches for gnulib macros. # @@ -44,3 +44,14 @@ _DX_GL_PATCH([gl-threadlib-mingw-default], # gnulib and bloat downstream configure scripts for no real reason. _DX_GL_PATCH([gl-no-warnings], [m4_ifdef([gl_CC_GNULIB_WARNINGS], [AC_DEFUN([gl_CC_GNULIB_WARNINGS])])]) + +# Avoid gnulib stdint.m4 from forcing HAVE_(UNSIGNED_)LONG_LONG_INT as this +# breaks anything which actually tries to use AC_TYPE_LONG_LONG_INT to work +# with missing long long, and is otherwise pointless. +# +# Gnulib itself doesn't care about these definitions and unconditionally uses +# long long. So by itself, this won't fix any failures in Gnulib due to an +# actually missing 'long long' but also should not create new problems. +_DX_GL_PATCH([stdint-no-fake-longlong], + [DX_PATCH_MACRO([gl_STDINT_H], + [AC_DEFINE(\[HAVE[_UNSIGNED]*_LONG_LONG_INT\][^)]*.], [dnl])]) -- 2.43.2