aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2021-10-05 09:08:02 -0700
committerPaul Eggert2021-10-05 09:09:23 -0700
commit4d76765b6c8a3117c436ccc93572cddfd8d17d7c (patch)
treef78c3f96695f5af738e67b2d08a87b27337d2d41 /admin
parent18308b739a561bff677929da2a1412e91c0d05cd (diff)
downloademacs-4d76765b6c8a3117c436ccc93572cddfd8d17d7c.tar.gz
emacs-4d76765b6c8a3117c436ccc93572cddfd8d17d7c.zip
Fix md5 issue in recent Gnulib merge
When configured --with-native-compilation, Emacs needs md5_stream. Problem reported by Andy Moreton (Bug#50985#23). * admin/merge-gnulib (GNULIB_MODULES): Add crypto/md5, needed for --with-native-compilation. (AVOIDED_MODULES): Avoid crypto/af_alg, since Emacs doesn’t need to bother with kernel-supported cryptography algorithms. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate by running admin/merge-gnulib. * lib/md5-stream.c: New file, copied from Gnulib.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib5
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 10cc73aa734..886f37e28cc 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -30,7 +30,8 @@ GNULIB_MODULES='
30 canonicalize-lgpl 30 canonicalize-lgpl
31 careadlinkat close-stream copy-file-range 31 careadlinkat close-stream copy-file-range
32 count-leading-zeros count-one-bits count-trailing-zeros 32 count-leading-zeros count-one-bits count-trailing-zeros
33 crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer 33 crypto/md5 crypto/md5-buffer
34 crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
34 d-type diffseq double-slash-root dtoastr dtotimespec dup2 35 d-type diffseq double-slash-root dtoastr dtotimespec dup2
35 environ execinfo explicit_bzero faccessat 36 environ execinfo explicit_bzero faccessat
36 fchmodat fcntl fcntl-h fdopendir file-has-acl 37 fchmodat fcntl fcntl-h fdopendir file-has-acl
@@ -49,7 +50,7 @@ GNULIB_MODULES='
49' 50'
50 51
51AVOIDED_MODULES=' 52AVOIDED_MODULES='
52 btowc close dup fchdir fstat langinfo lock 53 btowc close crypto/af_alg dup fchdir fstat langinfo lock
53 mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo 54 mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
54 openat-die opendir pthread-h raise 55 openat-die opendir pthread-h raise
55 save-cwd select setenv sigprocmask stat stdarg stdbool 56 save-cwd select setenv sigprocmask stat stdarg stdbool