diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-10-05 09:08:02 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-10-05 09:09:23 -0700 |
| commit | 4d76765b6c8a3117c436ccc93572cddfd8d17d7c (patch) | |
| tree | f78c3f96695f5af738e67b2d08a87b27337d2d41 /lib/gnulib.mk.in | |
| parent | 18308b739a561bff677929da2a1412e91c0d05cd (diff) | |
| download | emacs-4d76765b6c8a3117c436ccc93572cddfd8d17d7c.tar.gz | |
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 'lib/gnulib.mk.in')
| -rw-r--r-- | lib/gnulib.mk.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index bac27f3a68d..e9a1a5dc028 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -36,6 +36,7 @@ # --no-vc-files \ # --avoid=btowc \ # --avoid=close \ +# --avoid=crypto/af_alg \ # --avoid=dup \ # --avoid=fchdir \ # --avoid=fstat \ @@ -79,6 +80,7 @@ # count-leading-zeros \ # count-one-bits \ # count-trailing-zeros \ +# crypto/md5 \ # crypto/md5-buffer \ # crypto/sha1-buffer \ # crypto/sha256-buffer \ @@ -544,8 +546,8 @@ GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ GMALLOC_OBJ = @GMALLOC_OBJ@ GMP_H = @GMP_H@ -GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ +GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@ GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@ GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@ @@ -1473,6 +1475,14 @@ EXTRA_DIST += count-trailing-zeros.h endif ## end gnulib module count-trailing-zeros +## begin gnulib module crypto/md5 +ifeq (,$(OMIT_GNULIB_MODULE_crypto/md5)) + +libgnu_a_SOURCES += md5-stream.c + +endif +## end gnulib module crypto/md5 + ## begin gnulib module crypto/md5-buffer ifeq (,$(OMIT_GNULIB_MODULE_crypto/md5-buffer)) |