From 27a2dbf7f00f2688f9968a24ee6d3c0bc20859d6 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 19 May 2024 09:46:26 +0800 Subject: [PATCH] Fix the DJGPP build * config.bat: Generate stdbit.in-h from stdbit.in.h. * msdos/sedlibmk.inp (GL_STDC_...): Enable generation of ISO C2x features. (STDBIT_H): Define to stdbit.h. (GL_GENERATE_STDBIT_H_CONDITION): Define to 1. (cherry picked from commit 48563687f28b900c5d2044403c6576fbbc4cfa01) --- config.bat | 1 + msdos/sedlibmk.inp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/config.bat b/config.bat index f63da88303c..20dbfda5548 100644 --- a/config.bat +++ b/config.bat @@ -303,6 +303,7 @@ If Exist sys_types.in.h update sys_types.in.h sys_types.in-h If Exist time.in.h update time.in.h time.in-h If Exist unistd.in.h update unistd.in.h unistd.in-h If Exist stdckdint.in.h update stdckdint.in.h stdckdint.in-h +If Exist stdbit.in.h update stdbit.in.h stdbit.in-h If Exist gnulib.mk.in update gnulib.mk.in gnulib.mk-in Rem Only repository has the msdos/autogen directory If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index a68e6f6aed3..d0b2da08656 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -198,6 +198,9 @@ s/@PACKAGE@/emacs/ # we get warnings building canonicalize-lgpl.o /^GL_GNULIB_RAWMEMCHR *=/s/@GL_GNULIB_RAWMEMCHR@/1/ /^GL_GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/ +# These variables control whether ISO C23 features are generated, +# e.g. those in stdbit.h. +/^GL_STDC_[^ =]* *= *@/s/@[^@\n]*@/1/ /^GL_GSETTINGS_CFLAGS *=/s/@[^@\n]*@// /^GL_GSETTINGS_LIBS *=/s/@[^@\n]*@// # Miscellaneous variables. @@ -347,6 +350,7 @@ s/@PACKAGE@/emacs/ /^LIMITS_H *=/s/@[^@\n]*@/limits.h/ /^IEEE754_H *=/s/@[^@\n]*@/ieee754.h/ /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/ +/^STDBIT_H *=/s/@[^@\n]*@/stdbit.h/ /^STDCKDINT_H *=/s/@[^@\n]*@/stdckdint.h/ /^STDDEF_H *=/s/@[^@\n]*@/stddef.h/ /^STDDEF_NOT_IDEMPOTENT *=/s/@[^@\n]*@/1/ @@ -445,6 +449,7 @@ s/= @GL_GENERATE_GMP_H_CONDITION@/= 1/ s/= @GL_GENERATE_GMP_GMP_H_CONDITION@/= / s/= @GL_GENERATE_MINI_GMP_H_CONDITION@/= 1/ s/= @GL_GENERATE_STDCKDINT_H_CONDITION@/= 1/ +s/= @GL_GENERATE_STDBIT_H_CONDITION@/= 1/ s/= @GL_COND_OBJ_STDIO_READ_CONDITION@/= / s/= @GL_COND_OBJ_STDIO_WRITE_CONDITION@/= / s/= @GL_COND_OBJ_STPNCPY_CONDITION@/= / -- 2.39.5