aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2011-05-13 12:55:44 -0600
committerEric Blake <eblake@redhat.com>2011-05-18 08:31:33 -0600
commitf3cfc99e794bd77479878fc224c6581b61d57dbd (patch)
tree372d02ad89c1800e139af0eb6d4e3b01944171c4 /bootstrap
parentAdd support for 'passthru' mode for direct network interfaces (diff)
downloadlibvirt-f3cfc99e794bd77479878fc224c6581b61d57dbd.tar.gz
libvirt-f3cfc99e794bd77479878fc224c6581b61d57dbd.tar.bz2
libvirt-f3cfc99e794bd77479878fc224c6581b61d57dbd.zip
build: update to latest gnulib
* .gnulib: Update, for bootstrap and other fixes. * bootstrap: Resynchronize with gnulib.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap12
1 files changed, 10 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index d32db57bf..522ac70a9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-05-11.17; # UTC
+scriptversion=2011-05-16.16; # UTC
# Bootstrap this package from checked-out sources.
@@ -670,10 +670,18 @@ symlink_to_dir()
cp -fp "$src" "$dst"
}
else
+ # Leave any existing symlink alone, if it already points to the source,
+ # so that broken build tools that care about symlink times
+ # aren't confused into doing unnecessary builds. Conversely, if the
+ # existing symlink's time stamp is older than the source, make it afresh,
+ # so that broken tools aren't confused into skipping needed builds. See
+ # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
test -h "$dst" &&
src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
- test "$src_i" = "$dst_i" || {
+ test "$src_i" = "$dst_i" &&
+ both_ls=`ls -dt "$src" "$dst"` &&
+ test "X$both_ls" = "X$dst$nl$src" || {
dot_dots=
case $src in
/*) ;;