diff options
Diffstat (limited to 'admin/merge-gnulib')
| -rwxr-xr-x | admin/merge-gnulib | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 40b5b78ee8f..29e5e43c9cd 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -30,12 +30,13 @@ GNULIB_MODULES=' careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat - fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync + fcntl fcntl-h fdatasync fdopendir + filemode filevercmp flexmember fstatat fsync getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog ignore-value intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat - sig2str socklen stat-time stdalign stddef stdio + sig2str socklen stat-time std-gnu11 stdalign stddef stdio stpcpy strftime strtoimax strtoumax symlink sys_stat sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub unsetenv update-copyright utimens @@ -44,7 +45,7 @@ GNULIB_MODULES=' GNULIB_TOOL_FLAGS=' --avoid=close --avoid=dup - --avoid=fchdir --avoid=flexmember --avoid=fstat + --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise @@ -93,7 +94,8 @@ test -x "$gnulib_srcdir"/gnulib-tool || { } "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && -rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ +rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \ + "$src"m4/gl-openssl.m4 \ "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && |