From 5d1e14bd8b9a11ab860937d3ab97248ddeef30b1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 7 Jan 2023 15:28:00 -0800 Subject: [PATCH] Adjust to recent Gnulib macro renaming Also, remove some references to unused Gnulib macros. --- configure.ac | 2 +- lib-src/Makefile.in | 13 +++++++------ msdos/autogen/Makefile.in | 6 ++---- msdos/sed1v2.inp | 7 +++---- msdos/sed3v2.inp | 5 ++--- msdos/sedlibmk.inp | 3 +-- src/Makefile.in | 12 ++++++------ test/Makefile.in | 6 +++--- 8 files changed, 25 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 7833ed3e464..8c11414fe0b 100644 --- a/configure.ac +++ b/configure.ac @@ -6361,7 +6361,7 @@ fi # it temporarily reverts them to their pre-pkg-config values, # because gnulib needs to work with both src (which uses the # pkg-config stuff) and lib-src (which does not). For example, gnulib -# may need to determine whether LIB_CLOCK_GETTIME should contain -lrt, +# may need to determine whether CLOCK_TIME_LIB should contain -lrt, # and it therefore needs to run in an environment where LIBS does not # already contain -lrt merely because 'pkg-config --libs' printed '-lrt' # for some package unrelated to lib-src. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 3f144401d65..5b82cf1151c 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -193,18 +193,18 @@ LIBRESOLV=@LIBRESOLV@ ## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL LIBS_MAIL=@LIBS_MAIL@ ## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ ## empty or -lbcrypt or -ladvapi32 -LIB_GETRANDOM = @LIB_GETRANDOM@ +GETRANDOM_LIB = @GETRANDOM_LIB@ ## Whatever libraries are needed for euidaccess -LIB_EACCESS=@LIB_EACCESS@ +EUIDACCESS_LIBGEN=@EUIDACCESS_LIBGEN@ ## Libraries needed for file_has_acl FILE_HAS_ACL_LIB=@FILE_HAS_ACL_LIB@ ## empty or -lwsock2 for MinGW LIB_WSOCK32=@LIB_WSOCK32@ ## Extra libraries for etags -LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM) +LIBS_ETAGS = $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) HAVE_SECCOMP=@HAVE_SECCOMP@ HAVE_LIBSECCOMP=@HAVE_LIBSECCOMP@ @@ -426,13 +426,14 @@ pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \ $(NTLIB) $(LOADLIBES) \ - $(LIB_WSOCK32) $(LIB_EACCESS) $(FILE_HAS_ACL_LIB) $(LIBS_ECLIENT) \ + $(LIB_WSOCK32) $(EUIDACCESS_LIBGEN) \ + $(FILE_HAS_ACL_LIB) $(LIBS_ECLIENT) \ -o $@ emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ $(LOADLIBES) \ - $(LIB_WSOCK32) $(LIB_EACCESS) $(LIBS_ECLIENT) -o $@ + $(LIB_WSOCK32) $(EUIDACCESS_LIBGEN) $(LIBS_ECLIENT) -o $@ be-resources: ${srcdir}/be_resources.cc ${config_h} $(AM_V_CXXLD)$(CXX) ${ALL_CXXFLAGS} ${HAIKU_LIBS} $< -o $@ diff --git a/msdos/autogen/Makefile.in b/msdos/autogen/Makefile.in index 7f44c9867fe..df9b7797989 100644 --- a/msdos/autogen/Makefile.in +++ b/msdos/autogen/Makefile.in @@ -921,13 +921,11 @@ LIBXT_OTHER = @LIBXT_OTHER@ LIBX_OTHER = @LIBX_OTHER@ LIBZ = @LIBZ@ LIB_ACL = @LIB_ACL@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_EACCESS = @LIB_EACCESS@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ +EUIDACCESS_LIBGEN = @EUIDACCESS_LIBGEN@ LIB_EXECINFO = @LIB_EXECINFO@ -LIB_FDATASYNC = @LIB_FDATASYNC@ LIB_MATH = @LIB_MATH@ LIB_PTHREAD = @LIB_PTHREAD@ -LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ LIB_TIMER_TIME = @LIB_TIMER_TIME@ LIB_WSOCK32 = @LIB_WSOCK32@ LN_S_FILEONLY = @LN_S_FILEONLY@ diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 4d4c80a6b1a..ac7041a1bed 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -48,9 +48,8 @@ s/\.h\.in/.h-in/ /^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIB_PTHREAD *=/s/@LIB_PTHREAD@// /^LIB_ACL *=/s/@LIB_ACL@// -/^LIB_EACCESS *=/s/@LIB_EACCESS@// -/^LIB_FDATASYNC *=/s/@LIB_FDATASYNC@// -/^LIB_NANOSLEEP *=/s/@LIB_NANOSLEEP@// +/^EUIDACCESS_LIBGEN *=/s/@EUIDACCESS_LIBGEN@// +/^NANOSLEEP_LIB *=/s/@NANOSLEEP_LIB@// s/ *@LIBTIFF@// s/ *@LIBJPEG@// s/ *@LIBPNG@// @@ -140,7 +139,7 @@ s/ *@WEBP_LIBS@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^LIBSYSTEMD_LIBS *=/s/@LIBSYSTEMD_LIBS@// /^LIBSYSTEMD_CFLAGS *=/s/@LIBSYSTEMD_CFLAGS@// -/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^CLOCK_TIME_LIB *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIB_EXECINFO *=/s/@[^@\n]*@//g /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index dc9eaff27c8..9688a27b066 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -32,9 +32,9 @@ /^LIBRESOLV *=/s/@[^@\n]*@//g /^LIBS_MAIL *=/s/@[^@\n]*@//g /^LIBS_SYSTEM *=/s/@[^@\n]*@//g -/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^CLOCK_TIME_LIB *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g -/^LIB_GETRANDOM *=/s/@[^@\n]*@//g +/^GETRANDOM_LIB *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^CPPFLAGS *=/s/@CPPFLAGS@// /^LDFLAGS *=/s/@LDFLAGS@// @@ -49,7 +49,6 @@ /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!.exe! /^CLIENTW *=/s/@CLIENTW@// -/^LIB_FDATASYNC *=/s/@LIB_FDATASYNC@// /^LIB_WSOCK32 *=/s/@LIB_WSOCK32@// /^LIBS_ECLIENT *=/s/@LIBS_ECLIENT@// /^NTLIB *=/s/@NTLIB@// diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 497aedb2096..634bf999e50 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -270,7 +270,6 @@ s/@PACKAGE@/emacs/ /^LDFLAGS *=/s/@[^@\n]*@// /^LD_FIRSTFLAG *=/s/@[^@\n]*@// /^LIB_PTHREAD *=/s/@[^@\n]*@// -/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// /^MAKEINFO *=/s/@MAKEINFO@/makeinfo/ # MKDIR_P lines are edited further below @@ -323,7 +322,7 @@ s/@PACKAGE@/emacs/ /^REPLACE_MKTIME *=/s/@[^@\n]*@/1/ # We don't want any other gnulib replacement functions /^REPLACE_[^ =]* *= *@/s/@[^@\n]*@/0/ -/^LIB_GETRANDOM[^ =]* *= *@/s/@[^@\n]*@// +/^GETRANDOM_LIB[^ =]* *= *@/s/@[^@\n]*@// /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@// /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/ /^ASSERT_H *=/s/@[^@\n]*@/assert.h/ diff --git a/src/Makefile.in b/src/Makefile.in index c29c3750e59..1a2a316b310 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -144,9 +144,9 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ M17N_FLT_LIBS = @M17N_FLT_LIBS@ LIB_ACL=@LIB_ACL@ -LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ -LIB_EACCESS=@LIB_EACCESS@ -LIB_NANOSLEEP=@LIB_NANOSLEEP@ +CLOCK_TIME_LIB=@CLOCK_TIME_LIB@ +EUIDACCESS_LIBGEN=@EUIDACCESS_LIBGEN@ +NANOSLEEP_LIB=@NANOSLEEP_LIB@ LIB_TIMER_TIME=@LIB_TIMER_TIME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -558,9 +558,9 @@ lisp = $(addprefix ${lispsource}/,${shortlisp}) ## Construct full set of libraries to be linked. LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(PGTK_LIBS) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ - $(LIB_NANOSLEEP) $(WEBKIT_LIBS) \ - $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ + $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(CLOCK_TIME_LIB) \ + $(NANOSLEEP_LIB) $(WEBKIT_LIBS) \ + $(EUIDACCESS_LIBGEN) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ $(XDBE_LIBS) $(XSYNC_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBS_SYSTEM) $(CAIRO_LIBS) \ diff --git a/test/Makefile.in b/test/Makefile.in index fd21695f5bc..f4b85e7dfe5 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -264,8 +264,8 @@ endif GMP_H = @GMP_H@ LIBGMP = @LIBGMP@ -LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ -LIB_NANOSLEEP = @LIB_NANOSLEEP@ +CLOCK_TIME_LIB = @CLOCK_TIME_LIB@ +NANOSLEEP_LIB = @NANOSLEEP_LIB@ MODULE_CFLAGS = $(and $(GMP_H),-I.) -I../src -I$(srcdir)/../src \ $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \ @@ -286,7 +286,7 @@ $(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h \ $(AM_V_at)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \ -o $@ $< $(LIBGMP) \ $(and $(GMP_H),$(srcdir)/../lib/mini-gmp.c) \ - $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) + $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) endif src/emacs-tests.log: ../lib-src/seccomp-filter.c -- 2.39.2