mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +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
parent
0d191d1394
commit
d484bfbace
411 changed files with 6048 additions and 2457 deletions
51
maint.mk
51
maint.mk
|
|
@ -2,7 +2,7 @@
|
|||
# This Makefile fragment tries to be general-purpose enough to be
|
||||
# used by many projects via the gnulib maintainer-makefile module.
|
||||
|
||||
## Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
## Copyright (C) 2001-2016 Free Software Foundation, Inc.
|
||||
##
|
||||
## This program is free software: you can redistribute it and/or modify
|
||||
## it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -21,13 +21,6 @@
|
|||
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
|
||||
ME := maint.mk
|
||||
|
||||
# Diagnostic for continued use of deprecated variable.
|
||||
# Remove in 2013
|
||||
ifneq ($(build_aux),)
|
||||
$(error "$(ME): \
|
||||
set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)")
|
||||
endif
|
||||
|
||||
# Helper variables.
|
||||
_empty =
|
||||
_sp = $(_empty) $(_empty)
|
||||
|
|
@ -155,6 +148,7 @@ export LC_ALL = C
|
|||
## Sanity checks. ##
|
||||
## --------------- ##
|
||||
|
||||
ifneq ($(_gl-Makefile),)
|
||||
_cfg_mk := $(wildcard $(srcdir)/cfg.mk)
|
||||
|
||||
# Collect the names of rules starting with 'sc_'.
|
||||
|
|
@ -196,6 +190,7 @@ local-check := \
|
|||
$(filter-out $(local-checks-to-skip), $(local-checks-available)))
|
||||
|
||||
syntax-check: $(local-check)
|
||||
endif
|
||||
|
||||
# _sc_search_regexp
|
||||
#
|
||||
|
|
@ -445,7 +440,7 @@ sc_require_config_h:
|
|||
# You must include <config.h> before including any other header file.
|
||||
# This can possibly be via a package-specific header, if given by cfg.mk.
|
||||
sc_require_config_h_first:
|
||||
@if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then \
|
||||
@if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
|
||||
fail=0; \
|
||||
for i in $$($(VC_LIST_EXCEPT) | grep '\.c$$'); do \
|
||||
grep '^# *include\>' $$i | $(SED) 1q \
|
||||
|
|
@ -469,7 +464,7 @@ sc_prohibit_HAVE_MBRTOWC:
|
|||
define _sc_header_without_use
|
||||
dummy=; : so we do not need a semicolon before each use; \
|
||||
h_esc=`echo '[<"]'"$$h"'[">]'|$(SED) 's/\./\\\\./g'`; \
|
||||
if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then \
|
||||
if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
|
||||
files=$$(grep -l '^# *include '"$$h_esc" \
|
||||
$$($(VC_LIST_EXCEPT) | grep '\.c$$')) && \
|
||||
grep -LE "$$re" $$files | grep . && \
|
||||
|
|
@ -656,8 +651,7 @@ sc_prohibit_strings_without_use:
|
|||
# Get the list of symbol names with this:
|
||||
# perl -lne '/^# *define ([A-Z]\w+)\(/ and print $1' lib/intprops.h|fmt
|
||||
_intprops_names = \
|
||||
TYPE_IS_INTEGER TYPE_TWOS_COMPLEMENT TYPE_ONES_COMPLEMENT \
|
||||
TYPE_SIGNED_MAGNITUDE TYPE_SIGNED TYPE_MINIMUM TYPE_MAXIMUM \
|
||||
TYPE_IS_INTEGER TYPE_SIGNED TYPE_MINIMUM TYPE_MAXIMUM \
|
||||
INT_BITS_STRLEN_BOUND INT_STRLEN_BOUND INT_BUFSIZE_BOUND \
|
||||
INT_ADD_RANGE_OVERFLOW INT_SUBTRACT_RANGE_OVERFLOW \
|
||||
INT_NEGATE_RANGE_OVERFLOW INT_MULTIPLY_RANGE_OVERFLOW \
|
||||
|
|
@ -716,7 +710,7 @@ sc_changelog:
|
|||
# Ensure that each .c file containing a "main" function also
|
||||
# calls set_program_name.
|
||||
sc_program_name:
|
||||
@require='set_program_name *\(m?argv\[0\]\);' \
|
||||
@require='set_program_name *\(.*\);' \
|
||||
in_vc_files='\.c$$' \
|
||||
containing='\<main *(' \
|
||||
halt='the above files do not call set_program_name' \
|
||||
|
|
@ -1001,6 +995,14 @@ sc_prohibit_undesirable_word_seq:
|
|||
| grep -vE '$(ignore_undesirable_word_sequence_RE_)' | grep . \
|
||||
&& { echo '$(ME): undesirable word sequence' >&2; exit 1; } || :
|
||||
|
||||
# Except for shell files and for loops, double semicolon is probably a mistake
|
||||
sc_prohibit_double_semicolon:
|
||||
@prohibit='; *;[ {} \]*(/[/*]|$$)' \
|
||||
in_vc_files='\.[chly]$$' \
|
||||
exclude='\bfor *\(.*\)' \
|
||||
halt="Double semicolon detected" \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
_ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
|
||||
_ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
|
||||
# Using test's -a and -o operators is not portable.
|
||||
|
|
@ -1192,7 +1194,7 @@ sc_copyright_check:
|
|||
in_vc_files=$(sample-test) \
|
||||
halt='out of date copyright in $(sample-test); update it' \
|
||||
$(_sc_search_regexp)
|
||||
@require='Copyright @copyright\{\} .*'$$(date +%Y)' Free' \
|
||||
@require='Copyright @copyright\{\} .*'$$(date +%Y) \
|
||||
in_vc_files=$(texi) \
|
||||
halt='out of date copyright in $(texi); update it' \
|
||||
$(_sc_search_regexp)
|
||||
|
|
@ -1597,7 +1599,7 @@ ifeq (a,b)
|
|||
# do not need to be marked. Symbols matching '__.*' are
|
||||
# reserved by the compiler, so are automatically excluded below.
|
||||
_gl_TS_unmarked_extern_functions ?= main usage
|
||||
_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\S+) *\(/
|
||||
_gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\w+) *\(/
|
||||
|
||||
# If your project uses a macro like "XTERN", then put
|
||||
# the following in cfg.mk to override this default:
|
||||
|
|
@ -1630,6 +1632,7 @@ _gl_TS_other_headers ?= *.h
|
|||
|
||||
.PHONY: _gl_tight_scope
|
||||
_gl_tight_scope: $(bin_PROGRAMS)
|
||||
sed_wrap='s/^/^_?/;s/$$/$$/'; \
|
||||
t=exceptions-$$$$; \
|
||||
trap 's=$$?; rm -f $$t; exit $$s' 0; \
|
||||
for sig in 1 2 3 13 15; do \
|
||||
|
|
@ -1639,20 +1642,20 @@ _gl_tight_scope: $(bin_PROGRAMS)
|
|||
test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`; \
|
||||
hdr=`for f in $(_gl_TS_headers); do \
|
||||
test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`; \
|
||||
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_functions); \
|
||||
( printf '%s\n' '__.*' $(_gl_TS_unmarked_extern_functions); \
|
||||
grep -h -A1 '^extern .*[^;]$$' $$src \
|
||||
| grep -vE '^(extern |--)' | $(SED) 's/ .*//'; \
|
||||
| grep -vE '^(extern |--|#)' | $(SED) 's/ .*//; /^$$/d'; \
|
||||
perl -lne \
|
||||
'$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr; \
|
||||
) | sort -u > $$t; \
|
||||
nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
|
||||
'$(_gl_TS_function_match) and print $$1' $$hdr; \
|
||||
) | sort -u | $(SED) "$$sed_wrap" > $$t; \
|
||||
nm -g $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
|
||||
&& { echo the above functions should have static scope >&2; \
|
||||
exit 1; } || : ; \
|
||||
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars); \
|
||||
perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' \
|
||||
( printf '%s\n' '__.*' main $(_gl_TS_unmarked_extern_vars); \
|
||||
perl -lne '$(_gl_TS_var_match) and print $$1' \
|
||||
$$hdr $(_gl_TS_other_headers) \
|
||||
) | sort -u > $$t; \
|
||||
nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
|
||||
) | sort -u | $(SED) "$$sed_wrap" > $$t; \
|
||||
nm -g $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
|
||||
| sort -u | grep -Ev -f $$t \
|
||||
&& { echo the above variables should have static scope >&2; \
|
||||
exit 1; } || :
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue