1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-08 10:50:21 +02:00

Update Gnulib to 68b6ade.

Also add --conditional-dependencies to the flags.  See:
https://lists.gnu.org/archive/html/guile-devel/2016-07/msg00012.html
This commit is contained in:
Andy Wingo 2016-07-07 12:39:14 +02:00
parent 04359b42b9
commit a92acb5fa4
5 changed files with 923 additions and 167 deletions

View file

@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --lgpl=3 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
@ -101,9 +101,11 @@ EXTRA_DIST += alignof.h
## begin gnulib module alloca
if gl_GNULIB_ENABLED_alloca
libgnu_la_LIBADD += @LTALLOCA@
libgnu_la_DEPENDENCIES += @LTALLOCA@
endif
EXTRA_DIST += alloca.c
EXTRA_libgnu_la_SOURCES += alloca.c
@ -178,7 +180,9 @@ EXTRA_DIST += arpa_inet.in.h
## begin gnulib module assure
if gl_GNULIB_ENABLED_assure
endif
EXTRA_DIST += assure.h
## end gnulib module assure
@ -200,7 +204,9 @@ EXTRA_libgnu_la_SOURCES += bind.c
## begin gnulib module btowc
if gl_GNULIB_ENABLED_btowc
endif
EXTRA_DIST += btowc.c
EXTRA_libgnu_la_SOURCES += btowc.c
@ -398,22 +404,28 @@ EXTRA_libgnu_la_SOURCES += dirfd.c
## begin gnulib module dirname-lgpl
if gl_GNULIB_ENABLED_a691da99c1d83b83238e45f41a696f5c
libgnu_la_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c
endif
EXTRA_DIST += dirname.h
## end gnulib module dirname-lgpl
## begin gnulib module dosname
if gl_GNULIB_ENABLED_dosname
endif
EXTRA_DIST += dosname.h
## end gnulib module dosname
## begin gnulib module dup2
if gl_GNULIB_ENABLED_dup2
endif
EXTRA_DIST += dup2.c
EXTRA_libgnu_la_SOURCES += dup2.c
@ -500,8 +512,10 @@ EXTRA_DIST += fcntl.in.h
## begin gnulib module fd-hook
if gl_GNULIB_ENABLED_43fe87a341d9b4b93c47c3ad819a5239
libgnu_la_SOURCES += fd-hook.c
endif
EXTRA_DIST += fd-hook.h
## end gnulib module fd-hook
@ -652,8 +666,10 @@ EXTRA_libgnu_la_SOURCES += getsockopt.c
## begin gnulib module gettext-h
if gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36
libgnu_la_SOURCES += gettext.h
endif
## end gnulib module gettext-h
## begin gnulib module gettimeofday
@ -714,8 +730,10 @@ V_GPERF_0 = @echo " GPERF " $@;
## begin gnulib module hard-locale
if gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76
libgnu_la_SOURCES += hard-locale.c
endif
EXTRA_DIST += hard-locale.h
## end gnulib module hard-locale
@ -811,7 +829,9 @@ EXTRA_libgnu_la_SOURCES += inet_pton.c
## begin gnulib module intprops
if gl_GNULIB_ENABLED_intprops
endif
EXTRA_DIST += intprops.h
## end gnulib module intprops
@ -845,7 +865,9 @@ EXTRA_libgnu_la_SOURCES += isnan.c isnand.c
## begin gnulib module isnand-nolibm
if gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21
endif
EXTRA_DIST += float+.h isnan.c isnand-nolibm.h isnand.c
EXTRA_libgnu_la_SOURCES += isnan.c isnand.c
@ -863,7 +885,9 @@ EXTRA_libgnu_la_SOURCES += isnan.c isnanf.c
## begin gnulib module isnanf-nolibm
if gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66
endif
EXTRA_DIST += float+.h isnan.c isnanf-nolibm.h isnanf.c
EXTRA_libgnu_la_SOURCES += isnan.c isnanf.c
@ -881,7 +905,9 @@ EXTRA_libgnu_la_SOURCES += isnan.c isnanl.c
## begin gnulib module isnanl-nolibm
if gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f
endif
EXTRA_DIST += float+.h isnan.c isnanl-nolibm.h isnanl.c
EXTRA_libgnu_la_SOURCES += isnan.c isnanl.c
@ -1067,7 +1093,9 @@ EXTRA_DIST += locale.in.h
## begin gnulib module localeconv
if gl_GNULIB_ENABLED_localeconv
endif
EXTRA_DIST += localeconv.c
EXTRA_libgnu_la_SOURCES += localeconv.c
@ -1076,7 +1104,9 @@ EXTRA_libgnu_la_SOURCES += localeconv.c
## begin gnulib module log
if gl_GNULIB_ENABLED_log
endif
EXTRA_DIST += log.c
EXTRA_libgnu_la_SOURCES += log.c
@ -1419,7 +1449,9 @@ EXTRA_DIST += math.in.h
## begin gnulib module mbrtowc
if gl_GNULIB_ENABLED_mbrtowc
endif
EXTRA_DIST += mbrtowc.c
EXTRA_libgnu_la_SOURCES += mbrtowc.c
@ -1428,7 +1460,9 @@ EXTRA_libgnu_la_SOURCES += mbrtowc.c
## begin gnulib module mbsinit
if gl_GNULIB_ENABLED_mbsinit
endif
EXTRA_DIST += mbsinit.c
EXTRA_libgnu_la_SOURCES += mbsinit.c
@ -1437,7 +1471,9 @@ EXTRA_libgnu_la_SOURCES += mbsinit.c
## begin gnulib module mbtowc
if gl_GNULIB_ENABLED_mbtowc
endif
EXTRA_DIST += mbtowc-impl.h mbtowc.c
EXTRA_libgnu_la_SOURCES += mbtowc.c
@ -1446,7 +1482,9 @@ EXTRA_libgnu_la_SOURCES += mbtowc.c
## begin gnulib module memchr
if gl_GNULIB_ENABLED_memchr
endif
EXTRA_DIST += memchr.c memchr.valgrind
EXTRA_libgnu_la_SOURCES += memchr.c
@ -1473,7 +1511,9 @@ EXTRA_libgnu_la_SOURCES += mkstemp.c
## begin gnulib module mktime
if gl_GNULIB_ENABLED_mktime
endif
EXTRA_DIST += mktime-internal.h mktime.c
EXTRA_libgnu_la_SOURCES += mktime.c
@ -1482,7 +1522,9 @@ EXTRA_libgnu_la_SOURCES += mktime.c
## begin gnulib module mktime-internal
if gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31
endif
EXTRA_DIST += mktime-internal.h mktime.c
EXTRA_libgnu_la_SOURCES += mktime.c
@ -1491,7 +1533,9 @@ EXTRA_libgnu_la_SOURCES += mktime.c
## begin gnulib module msvc-inval
if gl_GNULIB_ENABLED_f691f076f650964c9f5598c3ee487616
endif
EXTRA_DIST += msvc-inval.c msvc-inval.h
EXTRA_libgnu_la_SOURCES += msvc-inval.c
@ -1500,7 +1544,9 @@ EXTRA_libgnu_la_SOURCES += msvc-inval.c
## begin gnulib module msvc-nothrow
if gl_GNULIB_ENABLED_676220fa4366efa9bdbfccf11a857c07
endif
EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h
EXTRA_libgnu_la_SOURCES += msvc-nothrow.c
@ -1600,7 +1646,9 @@ EXTRA_libgnu_la_SOURCES += open.c
## begin gnulib module pathmax
if gl_GNULIB_ENABLED_pathmax
endif
EXTRA_DIST += pathmax.h
## end gnulib module pathmax
@ -1669,7 +1717,9 @@ EXTRA_libgnu_la_SOURCES += putenv.c
## begin gnulib module raise
if gl_GNULIB_ENABLED_raise
endif
EXTRA_DIST += raise.c
EXTRA_libgnu_la_SOURCES += raise.c
@ -1741,7 +1791,9 @@ EXTRA_libgnu_la_SOURCES += rmdir.c
## begin gnulib module round
if gl_GNULIB_ENABLED_round
endif
EXTRA_DIST += round.c
EXTRA_libgnu_la_SOURCES += round.c
@ -1768,14 +1820,18 @@ EXTRA_libgnu_la_SOURCES += safe-read.c
## begin gnulib module same-inode
if gl_GNULIB_ENABLED_9bc5f216d57e231e4834049d67d0db62
endif
EXTRA_DIST += same-inode.h
## end gnulib module same-inode
## begin gnulib module secure_getenv
if gl_GNULIB_ENABLED_secure_getenv
endif
EXTRA_DIST += secure_getenv.c
EXTRA_libgnu_la_SOURCES += secure_getenv.c
@ -1880,7 +1936,9 @@ EXTRA_DIST += signal.in.h
## begin gnulib module signbit
if gl_GNULIB_ENABLED_signbit
endif
EXTRA_DIST += float+.h signbitd.c signbitf.c signbitl.c
EXTRA_libgnu_la_SOURCES += signbitd.c signbitf.c signbitl.c
@ -1889,8 +1947,10 @@ EXTRA_libgnu_la_SOURCES += signbitd.c signbitf.c signbitl.c
## begin gnulib module size_max
if gl_GNULIB_ENABLED_size_max
libgnu_la_SOURCES += size_max.h
endif
## end gnulib module size_max
## begin gnulib module snippet/_Noreturn
@ -2001,7 +2061,9 @@ EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h
## begin gnulib module snprintf
if gl_GNULIB_ENABLED_snprintf
endif
EXTRA_DIST += snprintf.c
EXTRA_libgnu_la_SOURCES += snprintf.c
@ -2019,15 +2081,19 @@ EXTRA_libgnu_la_SOURCES += socket.c
## begin gnulib module sockets
if gl_GNULIB_ENABLED_sockets
libgnu_la_SOURCES += sockets.h sockets.c
endif
EXTRA_DIST += w32sock.h
## end gnulib module sockets
## begin gnulib module stat
if gl_GNULIB_ENABLED_stat
endif
EXTRA_DIST += stat.c
EXTRA_libgnu_la_SOURCES += stat.c
@ -2404,7 +2470,9 @@ EXTRA_DIST += stdlib.in.h
## begin gnulib module strdup-posix
if gl_GNULIB_ENABLED_f9850631dca91859e9cddac9359921c0
endif
EXTRA_DIST += strdup.c
EXTRA_libgnu_la_SOURCES += strdup.c
@ -2413,7 +2481,9 @@ EXTRA_libgnu_la_SOURCES += strdup.c
## begin gnulib module streq
if gl_GNULIB_ENABLED_streq
endif
EXTRA_DIST += streq.h
## end gnulib module streq
@ -2832,8 +2902,10 @@ EXTRA_DIST += sys_uio.in.h
## begin gnulib module tempname
if gl_GNULIB_ENABLED_tempname
libgnu_la_SOURCES += tempname.c
endif
EXTRA_DIST += tempname.h
## end gnulib module tempname
@ -2888,7 +2960,9 @@ EXTRA_DIST += time.in.h
## begin gnulib module time_r
if gl_GNULIB_ENABLED_time_r
endif
EXTRA_DIST += time_r.c
EXTRA_libgnu_la_SOURCES += time_r.c
@ -2906,7 +2980,9 @@ EXTRA_libgnu_la_SOURCES += time_rz.c
## begin gnulib module timegm
if gl_GNULIB_ENABLED_timegm
endif
EXTRA_DIST += mktime-internal.h timegm.c
EXTRA_libgnu_la_SOURCES += timegm.c
@ -3159,7 +3235,9 @@ EXTRA_DIST += unitypes.in.h
## begin gnulib module unsetenv
if gl_GNULIB_ENABLED_unsetenv
endif
EXTRA_DIST += unsetenv.c
EXTRA_libgnu_la_SOURCES += unsetenv.c
@ -3175,7 +3253,9 @@ EXTRA_DIST += $(top_srcdir)/build-aux/useless-if-before-free
## begin gnulib module vasnprintf
if gl_GNULIB_ENABLED_vasnprintf
endif
EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h
EXTRA_libgnu_la_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
@ -3328,7 +3408,9 @@ EXTRA_DIST += wchar.in.h
## begin gnulib module wcrtomb
if gl_GNULIB_ENABLED_wcrtomb
endif
EXTRA_DIST += wcrtomb.c
EXTRA_libgnu_la_SOURCES += wcrtomb.c
@ -3337,6 +3419,7 @@ EXTRA_libgnu_la_SOURCES += wcrtomb.c
## begin gnulib module wctype-h
if gl_GNULIB_ENABLED_3dcce957eadc896e63ab5f137947b410
BUILT_SOURCES += wctype.h
libgnu_la_SOURCES += wctype-h.c
@ -3371,6 +3454,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
mv $@-t $@
MOSTLYCLEANFILES += wctype.h wctype.h-t
endif
EXTRA_DIST += wctype.in.h
## end gnulib module wctype-h
@ -3386,8 +3470,10 @@ EXTRA_libgnu_la_SOURCES += write.c
## begin gnulib module xsize
if gl_GNULIB_ENABLED_xsize
libgnu_la_SOURCES += xsize.h xsize.c
endif
## end gnulib module xsize

View file

@ -470,6 +470,8 @@ mktime (struct tm *tp)
time zone names contained in the external variable 'tzname' shall
be set as if the tzset() function had been called. */
__tzset ();
#elif HAVE_TZSET
tzset ();
#endif
return __mktime_internal (tp, __localtime_r, &localtime_offset);

View file

@ -27,7 +27,7 @@
# Specification in the form of a command-line invocation:
# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --lgpl=3 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
# gnulib-tool --import --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --lgpl=3 --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap c-strcase canonicalize-lgpl ceil clock-time close connect copysign dirfd duplocale environ extensions flock floor fpieee frexp fstat fsync full-read full-write func gendocs getaddrinfo getlogin getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isfinite isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring link listen localcharset locale log1p lstat maintainer-makefile malloc-gnu malloca mkdir mkstemp nl_langinfo nproc open pipe-posix pipe2 poll putenv readlink recv recvfrom regex rename rmdir select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat time times trunc unistd verify vsnprintf warnings wchar
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gnulib-local])
@ -135,6 +135,7 @@ gl_TESTS_BASE([tests])
gl_LIB([libgnu])
gl_LGPL([3])
gl_MAKEFILE_NAME([])
gl_CONDITIONAL_DEPENDENCIES
gl_LIBTOOL
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
# serial 26
# serial 27
dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@ -30,6 +30,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
dnl in Autoconf and because it invokes AC_LIBOBJ.
AC_CHECK_HEADERS_ONCE([unistd.h])
AC_CHECK_DECLS_ONCE([alarm])
AC_CHECK_FUNCS_ONCE([tzset])
AC_REQUIRE([gl_MULTIARCH])
if test $APPLE_UNIVERSAL_BUILD = 1; then
# A universal build on Apple Mac OS X platforms.