mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-03 16:42:37 +00:00
maint: update to latest gnulib
Allows bootstrap to work on FreeBSD, where gzip doesn't have a '.' in its version; and silences false positives in the new 'make syntax-check' rule. * .gnulib: Update to latest. * bootstrap: Synchronize to upstream. * .x-sc_bindtextdomain: New exemptions. * Makefile.am (syntax_check_exceptions): Ship new file. * .gitignore: Regenerate per latest bootstrap, anchor entries that are only in the root directory, and consolidate entries from other generated .gitignore files. * build-aux/.gitignore, m4/.gitignore, po/.gitignore: Remove from version control, since bootstrap generates them.
This commit is contained in:
Eric Blake
parent
981d2cdab4
commit
144c06d4ee
65
.gitignore
vendored
65
.gitignore
vendored
|
|
@ -1,3 +1,7 @@
|
|||
!/m4/compiler-flags.m4
|
||||
!/po/*.po
|
||||
!/po/POTFILES.in
|
||||
!/po/libvirt.pot
|
||||
*#*#
|
||||
*.#*#
|
||||
*.a
|
||||
|
|
@ -12,45 +16,48 @@
|
|||
.git
|
||||
.git-module-status
|
||||
.sc-start-sc_*
|
||||
/ABOUT-NLS
|
||||
/COPYING
|
||||
/ChangeLog
|
||||
/GNUmakefile
|
||||
/INSTALL
|
||||
/NEWS
|
||||
/aclocal.m4
|
||||
/autom4te.cache
|
||||
/build-aux/
|
||||
/config.cache
|
||||
/config.guess
|
||||
/config.h
|
||||
/config.h.in
|
||||
/config.log
|
||||
/config.rpath
|
||||
/config.status
|
||||
/config.sub
|
||||
/configure
|
||||
/configure.lineno
|
||||
/gnulib/
|
||||
/libtool
|
||||
/libvirt-*.tar.gz
|
||||
/libvirt-[0-9]*
|
||||
/libvirt.pc
|
||||
/libvirt.spec
|
||||
/ltconfig
|
||||
/ltmain.sh
|
||||
/m4/
|
||||
/maint.mk
|
||||
/mingw32-libvirt.spec
|
||||
/mkinstalldirs
|
||||
/po/
|
||||
/proxy/
|
||||
ABOUT-NLS
|
||||
COPYING
|
||||
ChangeLog
|
||||
INSTALL
|
||||
/tests/*.log
|
||||
/tests/nwfilterxml2xmltest
|
||||
/update.log
|
||||
Makefile
|
||||
Makefile.in
|
||||
NEWS
|
||||
aclocal.m4
|
||||
autom4te.cache
|
||||
config.cache
|
||||
config.guess
|
||||
config.h
|
||||
config.h.in
|
||||
config.log
|
||||
config.rpath
|
||||
config.status
|
||||
config.sub
|
||||
configure
|
||||
configure.lineno
|
||||
coverage
|
||||
cscope.files
|
||||
cscope.out
|
||||
gnulib/
|
||||
libtool
|
||||
libvirt-*.tar.gz
|
||||
libvirt.pc
|
||||
libvirt.spec
|
||||
ltconfig
|
||||
ltmain.sh
|
||||
mingw32-libvirt.spec
|
||||
mkinstalldirs
|
||||
results.log
|
||||
stamp-h
|
||||
stamp-h.in
|
||||
stamp-h1
|
||||
tests/*.log
|
||||
tests/nwfilterxml2xmltest
|
||||
update.log
|
||||
|
|
|
|||
2
.gnulib
2
.gnulib
|
|
@ -1 +1 @@
|
|||
Subproject commit cac3889c1830d38e5b55ae69fc3d458498a0b33e
|
||||
Subproject commit 48b1a1ae7d5b0f1494aabd4c8a02fbfcec531026
|
||||
2
.x-sc_bindtextdomain
Normal file
2
.x-sc_bindtextdomain
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
^tests/.*
|
||||
^examples/.*
|
||||
|
|
@ -23,6 +23,7 @@ EXTRA_DIST = \
|
|||
.x-sc_avoid_ctype_macros \
|
||||
.x-sc_avoid_if_before_free \
|
||||
.x-sc_avoid_write \
|
||||
.x-sc_bindtextdomain \
|
||||
.x-sc_m4_quote_check \
|
||||
.x-sc_prohibit_asprintf \
|
||||
.x-sc_prohibit_empty_lines_at_EOF \
|
||||
|
|
|
|||
44
bootstrap
44
bootstrap
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Print a version string.
|
||||
scriptversion=2010-10-08.16; # UTC
|
||||
scriptversion=2010-11-12.21; # UTC
|
||||
|
||||
# Bootstrap this package from checked-out sources.
|
||||
|
||||
|
|
@ -261,6 +261,21 @@ insert_sorted_if_absent() {
|
|||
|| exit 1
|
||||
}
|
||||
|
||||
# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
|
||||
# insert_sorted_if_absent.
|
||||
insert_vc_ignore() {
|
||||
vc_ignore_file="$1"
|
||||
pattern="$2"
|
||||
case $vc_ignore_file in
|
||||
*.gitignore)
|
||||
# A .gitignore entry that does not start with `/' applies
|
||||
# recursively to subdirectories, so prepend `/' to every
|
||||
# .gitignore entry.
|
||||
pattern=`echo "$pattern" | sed s,^,/,`;;
|
||||
esac
|
||||
insert_sorted_if_absent "$vc_ignore_file" "$pattern"
|
||||
}
|
||||
|
||||
# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
|
||||
found_aux_dir=no
|
||||
grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
|
||||
|
|
@ -279,7 +294,7 @@ if test ! -d $build_aux; then
|
|||
mkdir $build_aux
|
||||
for dot_ig in x $vc_ignore; do
|
||||
test $dot_ig = x && continue
|
||||
insert_sorted_if_absent $dot_ig $build_aux
|
||||
insert_vc_ignore $dot_ig $build_aux
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -329,17 +344,18 @@ get_version() {
|
|||
$app --version >/dev/null 2>&1 || return 1
|
||||
|
||||
$app --version 2>&1 |
|
||||
sed -n '# extract version within line
|
||||
s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
|
||||
t done
|
||||
sed -n '# Move version to start of line.
|
||||
s/.*[v ]\([0-9]\)/\1/
|
||||
|
||||
# extract version at start of line
|
||||
s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
|
||||
t done
|
||||
# Skip lines that do not start with version.
|
||||
/^[0-9]/!d
|
||||
|
||||
d
|
||||
# Remove characters after the version.
|
||||
s/[^.a-z0-9-].*//
|
||||
|
||||
# The first component must be digits only.
|
||||
s/^\([0-9]*\)[a-z-].*/\1/
|
||||
|
||||
:done
|
||||
#the following essentially does s/5.005/5.5/
|
||||
s/\.0*\([1-9]\)/.\1/g
|
||||
p
|
||||
|
|
@ -565,7 +581,7 @@ symlink_to_dir()
|
|||
for dot_ig in x $vc_ignore; do
|
||||
test $dot_ig = x && continue
|
||||
ig=$parent/$dot_ig
|
||||
insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
|
||||
insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -725,7 +741,7 @@ slurp() {
|
|||
test $dot_ig = x && continue
|
||||
ig=$dir/$dot_ig
|
||||
if test -n "$copied"; then
|
||||
insert_sorted_if_absent $ig "$copied"
|
||||
insert_vc_ignore $ig "$copied"
|
||||
# If an ignored file name ends with .in.h, then also add
|
||||
# the name with just ".h". Many gnulib headers are generated,
|
||||
# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
|
||||
|
|
@ -738,12 +754,12 @@ slurp() {
|
|||
s/\.gperf$/.h/
|
||||
'
|
||||
`
|
||||
insert_sorted_if_absent $ig "$f"
|
||||
insert_vc_ignore $ig "$f"
|
||||
|
||||
# For files like sys_stat.in.h and sys_time.in.h, record as
|
||||
# ignorable the directory we might eventually create: sys/.
|
||||
f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
|
||||
insert_sorted_if_absent $ig "$f"
|
||||
insert_vc_ignore $ig "$f"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
|
|
|||
16
build-aux/.gitignore
vendored
16
build-aux/.gitignore
vendored
|
|
@ -1,16 +0,0 @@
|
|||
*
|
||||
/arg-nonnull.h
|
||||
/gitlog-to-changelog
|
||||
/link-warning.h
|
||||
/mktempd
|
||||
/useless-if-before-free
|
||||
/vc-list-files
|
||||
arg-nonnull.h
|
||||
c++defs.h
|
||||
config.rpath
|
||||
gitlog-to-changelog
|
||||
mkinstalldirs
|
||||
mktempd
|
||||
useless-if-before-free
|
||||
vc-list-files
|
||||
warn-on-use.h
|
||||
37
m4/.gitignore
vendored
37
m4/.gitignore
vendored
|
|
@ -1,37 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
acinclude.m4
|
||||
aclocal.m4
|
||||
codeset.m4
|
||||
gettext.m4
|
||||
glibc21.m4
|
||||
iconv.m4
|
||||
intdiv0.m4
|
||||
intmax.m4
|
||||
inttypes-pri.m4
|
||||
inttypes.m4
|
||||
inttypes_h.m4
|
||||
isc-posix.m4
|
||||
lcmessage.m4
|
||||
lib-ld.m4
|
||||
lib-link.m4
|
||||
lib-prefix.m4
|
||||
libtool.m4
|
||||
longdouble.m4
|
||||
longlong.m4
|
||||
ltoptions.m4
|
||||
ltsugar.m4
|
||||
ltversion.m4
|
||||
lt~obsolete.m4
|
||||
nls.m4
|
||||
po.m4
|
||||
printf-posix.m4
|
||||
progtest.m4
|
||||
signed.m4
|
||||
size_max.m4
|
||||
stdint_h.m4
|
||||
uintmax_t.m4
|
||||
ulonglong.m4
|
||||
wchar_t.m4
|
||||
wint_t.m4
|
||||
xsize.m4
|
||||
17
po/.gitignore
vendored
17
po/.gitignore
vendored
|
|
@ -1,17 +0,0 @@
|
|||
*.gmo
|
||||
Makefile
|
||||
Makefile.in
|
||||
Makefile.in.in
|
||||
Makevars
|
||||
Makevars.template
|
||||
POTFILES
|
||||
Rules-quot
|
||||
boldquot.sed
|
||||
en@boldquot.header
|
||||
en@quot.header
|
||||
insert-header.sed
|
||||
insert-header.sin
|
||||
quot.sed
|
||||
remove-potcdate.sed
|
||||
remove-potcdate.sin
|
||||
stamp-po
|
||||
Loading…
Reference in New Issue
Block a user