aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2019-04-14 16:31:24 -0700
committerPaul Eggert2019-04-14 17:06:09 -0700
commit5c2f94a182a1154766154040eb5b4b39275fd3b6 (patch)
tree04ae030b12f1e993173fe33b34ea1975ec9340c7 /admin
parent661f44946d2bba21d16d718cf86372345c929a39 (diff)
downloademacs-5c2f94a182a1154766154040eb5b4b39275fd3b6.tar.gz
emacs-5c2f94a182a1154766154040eb5b4b39275fd3b6.zip
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple. (AVOIDED_MODULES): Add memchr. * configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles. * lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o. * lib/fingerprint.c: New file. * lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files, copied from Gnulib. * lib/fingerprint.h: Rename from src/fingerprint.h. * lib-src/make-fingerprint.c: Include limits.h, sys/stat.h, fingerprint.h, intprops.h, min-max.h. (SSIZE_MAX): New macro, if not already defined. (main): Without -r, Replace the fingerprint in the input file instead of generating a fingerprint.c. * lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT): New macros. (temacs$(EXEEXT)): Use them to replace the fingerprint instead of precalculating it. (mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 055e791d62a..4a69310d83c 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -36,7 +36,7 @@ GNULIB_MODULES='
36 filemode filevercmp flexmember fpieee fstatat fsusage fsync 36 filemode filevercmp flexmember fpieee fstatat fsusage fsync
37 getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog 37 getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
38 ieee754-h ignore-value intprops largefile lstat 38 ieee754-h ignore-value intprops largefile lstat
39 manywarnings memrchr minmax mkostemp mktime nstrftime 39 manywarnings memmem-simple memrchr minmax mkostemp mktime nstrftime
40 pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat regex 40 pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat regex
41 sig2str socklen stat-time std-gnu11 stdalign stddef stdio 41 sig2str socklen stat-time std-gnu11 stdalign stddef stdio
42 stpcpy strtoimax symlink sys_stat sys_time 42 stpcpy strtoimax symlink sys_stat sys_time
@@ -47,7 +47,7 @@ GNULIB_MODULES='
47 47
48AVOIDED_MODULES=' 48AVOIDED_MODULES='
49 btowc close dup fchdir fstat langinfo lock 49 btowc close dup fchdir fstat langinfo lock
50 malloc-posix mbrtowc mbsinit mkdir msvc-inval msvc-nothrow nl_langinfo 50 malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
51 openat-die opendir raise 51 openat-die opendir raise
52 save-cwd select setenv sigprocmask stat stdarg stdbool 52 save-cwd select setenv sigprocmask stat stdarg stdbool
53 threadlib tzset unsetenv utime utime-h 53 threadlib tzset unsetenv utime utime-h