diff options
| author | Paul Eggert | 2022-02-23 11:23:05 -0800 |
|---|---|---|
| committer | Paul Eggert | 2022-02-23 11:41:02 -0800 |
| commit | a773a7831226c146edd40dbaf97f3cfad995f8ee (patch) | |
| tree | 9f44a7ae6ffd711b153ac30090fe979e4cfa0ff8 /admin | |
| parent | 308e63ccfcc6a6b1285bb17eff641f48639fb329 (diff) | |
| download | emacs-a773a7831226c146edd40dbaf97f3cfad995f8ee.tar.gz emacs-a773a7831226c146edd40dbaf97f3cfad995f8ee.zip | |
Port to current Gnulib some more
* admin/merge-gnulib: Remove lib/stdio-read.c and lib/stdio-write.c,
as Emacs doesn’t need these new Gnulib files.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 73b3d390499..4045eabf4e4 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -109,7 +109,9 @@ done | |||
| 109 | 109 | ||
| 110 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \ | 110 | "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \ |
| 111 | $avoided_flags $GNULIB_MODULES && | 111 | $avoided_flags $GNULIB_MODULES && |
| 112 | rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ | 112 | rm -- "$src"lib/gl_openssl.h \ |
| 113 | "$src"lib/stdio-read.c "$src"lib/stdio-write.c \ | ||
| 114 | "$src"m4/fcntl-o.m4 \ | ||
| 113 | "$src"m4/gl-openssl.m4 \ | 115 | "$src"m4/gl-openssl.m4 \ |
| 114 | "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ | 116 | "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \ |
| 115 | "$src"m4/manywarnings-c++.m4 \ | 117 | "$src"m4/manywarnings-c++.m4 \ |