diff options
| author | Paul Eggert | 2025-12-07 15:34:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2025-12-07 15:45:20 -0800 |
| commit | b211e5489b95f39f07baa769fc581b05b393c4a3 (patch) | |
| tree | 34f59c09f3779fdf25f32bccbe8aa48491ee5b4f /lib/gnulib.mk.in | |
| parent | 0d43f2a562c84ff440da978a9275fc44e6f5d9da (diff) | |
| download | emacs-b211e5489b95f39f07baa769fc581b05b393c4a3.tar.gz emacs-b211e5489b95f39f07baa769fc581b05b393c4a3.zip | |
Update from Gnulib by running admin/merge-gnulib
* admin/merge-gnulib (AVOIDED_MODULES): Add strncpy, as Emacs is not
likely to exercise the FreeBSD 15 strncpy bug that this module fixes.
* lib/issymlinkat.h: New file, taken from Gnulib.
Diffstat (limited to 'lib/gnulib.mk.in')
| -rw-r--r-- | lib/gnulib.mk.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 96d9cd8bd44..297af181c57 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | # --avoid=stat \ | 71 | # --avoid=stat \ |
| 72 | # --avoid=std-gnu11 \ | 72 | # --avoid=std-gnu11 \ |
| 73 | # --avoid=stdarg-h \ | 73 | # --avoid=stdarg-h \ |
| 74 | # --avoid=strncpy \ | ||
| 74 | # --avoid=threadlib \ | 75 | # --avoid=threadlib \ |
| 75 | # --avoid=tzset \ | 76 | # --avoid=tzset \ |
| 76 | # --avoid=unsetenv \ | 77 | # --avoid=unsetenv \ |
| @@ -631,6 +632,7 @@ GL_GNULIB_STRERROR_R = @GL_GNULIB_STRERROR_R@ | |||
| 631 | GL_GNULIB_STRFTIME = @GL_GNULIB_STRFTIME@ | 632 | GL_GNULIB_STRFTIME = @GL_GNULIB_STRFTIME@ |
| 632 | GL_GNULIB_STRINGEQ = @GL_GNULIB_STRINGEQ@ | 633 | GL_GNULIB_STRINGEQ = @GL_GNULIB_STRINGEQ@ |
| 633 | GL_GNULIB_STRNCAT = @GL_GNULIB_STRNCAT@ | 634 | GL_GNULIB_STRNCAT = @GL_GNULIB_STRNCAT@ |
| 635 | GL_GNULIB_STRNCPY = @GL_GNULIB_STRNCPY@ | ||
| 634 | GL_GNULIB_STRNDUP = @GL_GNULIB_STRNDUP@ | 636 | GL_GNULIB_STRNDUP = @GL_GNULIB_STRNDUP@ |
| 635 | GL_GNULIB_STRNLEN = @GL_GNULIB_STRNLEN@ | 637 | GL_GNULIB_STRNLEN = @GL_GNULIB_STRNLEN@ |
| 636 | GL_GNULIB_STRPBRK = @GL_GNULIB_STRPBRK@ | 638 | GL_GNULIB_STRPBRK = @GL_GNULIB_STRPBRK@ |
| @@ -1327,6 +1329,7 @@ REPLACE_STRERROR_L = @REPLACE_STRERROR_L@ | |||
| 1327 | REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ | 1329 | REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ |
| 1328 | REPLACE_STRFTIME = @REPLACE_STRFTIME@ | 1330 | REPLACE_STRFTIME = @REPLACE_STRFTIME@ |
| 1329 | REPLACE_STRNCAT = @REPLACE_STRNCAT@ | 1331 | REPLACE_STRNCAT = @REPLACE_STRNCAT@ |
| 1332 | REPLACE_STRNCPY = @REPLACE_STRNCPY@ | ||
| 1330 | REPLACE_STRNDUP = @REPLACE_STRNDUP@ | 1333 | REPLACE_STRNDUP = @REPLACE_STRNDUP@ |
| 1331 | REPLACE_STRNLEN = @REPLACE_STRNLEN@ | 1334 | REPLACE_STRNLEN = @REPLACE_STRNLEN@ |
| 1332 | REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ | 1335 | REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ |
| @@ -2650,7 +2653,7 @@ ifneq (,$(gl_GNULIB_ENABLED_issymlinkat_CONDITION)) | |||
| 2650 | libgnu_a_SOURCES += issymlinkat.c | 2653 | libgnu_a_SOURCES += issymlinkat.c |
| 2651 | 2654 | ||
| 2652 | endif | 2655 | endif |
| 2653 | EXTRA_DIST += issymlink.h | 2656 | EXTRA_DIST += issymlinkat.h |
| 2654 | 2657 | ||
| 2655 | endif | 2658 | endif |
| 2656 | ## end gnulib module issymlinkat | 2659 | ## end gnulib module issymlinkat |
| @@ -3757,6 +3760,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H | |||
| 3757 | -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ | 3760 | -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ |
| 3758 | -e 's/@''GNULIB_STRINGEQ''@/$(GL_GNULIB_STRINGEQ)/g' \ | 3761 | -e 's/@''GNULIB_STRINGEQ''@/$(GL_GNULIB_STRINGEQ)/g' \ |
| 3759 | -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ | 3762 | -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ |
| 3763 | -e 's/@''GNULIB_STRNCPY''@/$(GL_GNULIB_STRNCPY)/g' \ | ||
| 3760 | -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ | 3764 | -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ |
| 3761 | -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ | 3765 | -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ |
| 3762 | -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ | 3766 | -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ |
| @@ -3818,6 +3822,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H | |||
| 3818 | -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ | 3822 | -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ |
| 3819 | -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ | 3823 | -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ |
| 3820 | -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ | 3824 | -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ |
| 3825 | -e 's|@''REPLACE_STRNCPY''@|$(REPLACE_STRNCPY)|g' \ | ||
| 3821 | -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ | 3826 | -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ |
| 3822 | -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ | 3827 | -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ |
| 3823 | -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ | 3828 | -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ |