External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-27 13:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update gnulib to fix mingw64 compilation errors

Browse Source
This commit is contained in:
Marc-André Lureau 2012-02-02 01:28:28 +01:00 committed by Eric Blake
parent 22ec60001e
commit 02ee87451b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

@ -1 +1 @@
Subproject commit dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 Subproject commit e9e8aba12af3c903edd422fa036a356c5b2f313a

16
bootstrap
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2012-01-16.17; # UTC scriptversion=2012-01-21.16; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
@ -87,9 +87,9 @@ gnulib_files=
: ${AUTOPOINT=autopoint} : ${AUTOPOINT=autopoint}
: ${AUTORECONF=autoreconf} : ${AUTORECONF=autoreconf}
# A function to be called to edit gnulib.mk right after it's created. # A function to be called right after gnulib-tool is run.
# Override it via your own definition in bootstrap.conf. # Override it via your own definition in bootstrap.conf.
gnulib_mk_hook() { :; } bootstrap_post_import_hook() { :; }
# A function to be called after everything else in this script. # A function to be called after everything else in this script.
# Override it via your own definition in bootstrap.conf. # Override it via your own definition in bootstrap.conf.
@ -807,6 +807,9 @@ for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file || exit symlink_to_dir "$GNULIB_SRCDIR" $file || exit
done done
bootstrap_post_import_hook \
|| { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail. # gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual # The following requires GNU find 4.2.3 or newer. Considering the usual
@ -819,11 +822,16 @@ find "$m4_base" "$source_base" \
-depth \( -name '*.m4' -o -name '*.[ch]' \) \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \
-type l -xtype l -delete > /dev/null 2>&1 -type l -xtype l -delete > /dev/null 2>&1
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. # Some systems (RHEL 5) are using ancient autotools, for which the
# --no-recursive option had not been invented. Detect that lack and
# omit the option when it's not supported. FIXME in 2017: remove this
# hack when RHEL 5 autotools are updated, or when they become irrelevant.
no_recursive= no_recursive=
case $($AUTORECONF --help) in case $($AUTORECONF --help) in
*--no-recursive*) no_recursive=--no-recursive;; *--no-recursive*) no_recursive=--no-recursive;;
esac esac
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
"$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \ AUTOPOINT=true LIBTOOLIZE=true \