[SCM] GNU Libtool branch, master, updated. v2.2.8-11-g0e3d88b

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  0e3d88b8399b610522ddb59625f3f9cc021fdd14 (commit)
       via  9a801684f6e1a665dc7126091662b34d042adf68 (commit)
      from  b188543381ff1b0815e7e301d2f40170868abe82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e3d88b8399b610522ddb59625f3f9cc021fdd14
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jun 7 22:32:26 2010 +0200

    Make versioning test stricter for w32, enable shared libs.
    
    * tests/versioning.at (versioning): Add -no-undefined to
    LDFLAGS.
    (test_uninstalled): Also move $bindir out of the way
    temporarily.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 9a801684f6e1a665dc7126091662b34d042adf68
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jun 7 22:30:44 2010 +0200

    Fix versioning test for LDFLAGS=-Wl,--as-needed.
    
    * tests/versioning.at (versioning): For the library update
    hypotheses, ensure the unchanged library libb isn't accidentally
    relinked against the new liba, by not reinstalling libb.
    Fixes testsuite failure for the incompatible update case with
    LDFLAGS=-Wl,--as-needed.
    * THANKS: Update.
    Report by Ryan Hill.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   17 +++++++++++++++++
 THANKS              |    1 +
 tests/versioning.at |   26 ++++++++++++++------------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b79b004..9a03c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-06-07  Ralf Wildenhues  <address@hidden>
+
+       Make versioning test stricter for w32, enable shared libs.
+       * tests/versioning.at (versioning): Add -no-undefined to
+       LDFLAGS.
+       (test_uninstalled): Also move $bindir out of the way
+       temporarily.
+
+       Fix versioning test for LDFLAGS=-Wl,--as-needed.
+       * tests/versioning.at (versioning): For the library update
+       hypotheses, ensure the unchanged library libb isn't accidentally
+       relinked against the new liba, by not reinstalling libb.
+       Fixes testsuite failure for the incompatible update case with
+       LDFLAGS=-Wl,--as-needed.
+       * THANKS: Update.
+       Report by Ryan Hill.
+
 2010-06-06  Ralf Wildenhues  <address@hidden>
 
        Rewrite manual intro to be gender-neutral.
diff --git a/THANKS b/THANKS
index 529a699..14ab56b 100644
--- a/THANKS
+++ b/THANKS
@@ -158,6 +158,7 @@
   Roland Mainz                 address@hidden
   Roumen Petrov                        address@hidden
   Rudolf Leitgeb               address@hidden
+  Ryan Hill                    address@hidden
   Sam Thursfield               address@hidden
   Scott McCreary               address@hidden
   Sebastian Wilhelmi           address@hidden
diff --git a/tests/versioning.at b/tests/versioning.at
index 136a549..69bf731 100644
--- a/tests/versioning.at
+++ b/tests/versioning.at
@@ -1,6 +1,6 @@
 # versioning.at -- test libtool versioning           -*- Autotest -*-
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -103,6 +103,7 @@ int main (void)
 inst=`pwd`/inst
 libdir=$inst/lib
 bindir=$inst/bin
+LDFLAGS="$LDFLAGS -no-undefined"
 mkdir $inst $libdir $bindir
 
 for file in liba1.c liba2.c liba3.c liba4.c libb.c; do
@@ -155,10 +156,12 @@ test_uninstalled ()
 {
   # temporarily move installed libraries out of the way in order to avoid
   # skewing test results:
-  mv $libdir temp
+  mv $libdir temp-lib
+  mv $bindir temp-bin
   LT_AT_EXEC_CHECK([./prog1])
   LT_AT_EXEC_CHECK([./prog2])
-  mv temp $libdir
+  mv temp-lib $libdir
+  mv temp-bin $bindir
 }
 
 test_installed ()
@@ -190,18 +193,17 @@ AT_CHECK([$LIBTOOL --mode=uninstall rm -f 
$libdir/liba.la], [], [ignore], [ignor
 
 
 # Hypothesis: library revision updates do not require (uninstalled
-# nor installed) programs to be relinked.
+# nor installed) programs or libraries to be relinked.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba2.lo ]dnl
         [-version-info 0:1:0 -rpath $libdir], [], [ignore], [ignore])
 test_uninstalled
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-        [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 # do not uninstall here: the library may be reused in the next test.
 
 # Hypothesis: backward compatible library updates do not require
-# (uninstalled nor installed) programs to be relinked.
+# (uninstalled nor installed) programs or libraries to be relinked.
 # This can have one of several reasons:
 # - the soname is the difference between $current and $age, thus
 #   unchanged; in this case, the newly installed library will be used,
@@ -212,26 +214,26 @@ test_installed
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba3.lo ]dnl
         [-version-info 1:0:1 -rpath $libdir], [], [ignore], [ignore])
 # Do not test the uninstalled program, it may be broken (in the second case).
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-        [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 # do not uninstall here: the library may be reused in the next test.
 
 
 # Hypothesis: with shared libraries, incompatible library updates
-# will not cause old installed programs (linked against the old
+# will not cause old installed programs or libraries (linked against the old
 # library version) to break.
 # This can have one of several reasons:
 # - the soname has changed, so the old installed library will still be
 #   available,
 # - we are linking statically, so the old library code will still be used.
+# In order to be sure we are still linking against the old library version,
+# we must ensure that libb is not relinked, so we must not reinstall libb here.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba4.lo ]dnl
         [-version-info 2:0:0 -rpath $libdir], [], [ignore], [ignore])
 # We do not guarantee that old versions of an uninstalled library are still
 # available, so test_uninstalled will not necessarily work here any more.
-AT_CHECK([$LIBTOOL --mode=install cp liba.la libb.la $libdir],
-        [], [ignore], [ignore])
+AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=clean rm -f liba.la], [], [ignore], [ignore])
 test_installed
 


hooks/post-receive
-- 
GNU Libtool