[SCM] GNU Libtool branch, master, updated. v2.2.4-33-g649567e

[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  649567ed497902046abecd01a2fa0c5206d51730 (commit)
      from  c766e70ca307789f4d95b29c84f61e0c8777d141 (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 649567ed497902046abecd01a2fa0c5206d51730
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Aug 16 17:28:30 2008 +0200

    Avoid test failure due to broken dlpreloading of shared library.
    
    * tests/lt_dladvise.at (lt_dlopenadvise library loading): Drop
    some newlines in AT_CHECK commands, for better 'testsuite -x'
    output.  Only create a static installable libpreload.la, to
    avoid exposing the bug libtool currently has with preloading of
    shared libraries.  Add a note to revisit this later.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog            |    9 +++++++++
 tests/lt_dladvise.at |   17 ++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ee10ae..fa04482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-16  Ralf Wildenhues  <address@hidden>
+
+       Avoid test failure due to broken dlpreloading of shared library.
+       * tests/lt_dladvise.at (lt_dlopenadvise library loading): Drop
+       some newlines in AT_CHECK commands, for better 'testsuite -x'
+       output.  Only create a static installable libpreload.la, to
+       avoid exposing the bug libtool currently has with preloading of
+       shared libraries.  Add a note to revisit this later.
+
 2008-08-12  Ralf Wildenhues  <address@hidden>
 
        Parallel make testsuite fixes.
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index c0cd768..dccb122 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -327,8 +327,8 @@ cygwin* | mingw*)
   CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=1"
   dlopenable="$dlopen depend"
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c moddepend.c
-  AT_CHECK([$LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la \
-            moddepend.lo -rpath /foo -avoid-version], [], [ignore], [ignore])
+  AT_CHECK([$LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o libdepend.la 
]dnl
+           [moddepend.lo -rpath /foo -avoid-version], [], [ignore], [ignore])
   ;;
 esac
 
@@ -340,9 +340,16 @@ LDFLAGS="$LDFLAGS -no-undefined"
 
 $CC $CPPFLAGS $CFLAGS -c main.c
 for name in resident local global preload; do
+  # FIXME: adding -static to libpreload shouldn't be necessary.
+  #        Fix this properly in ltmain, then remove this workaround.
+  if test $name = preload; then
+    st=-static
+  else
+    st=
+  fi
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c mod$name.c
-  AT_CHECK([$LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la \
-            mod$name.lo -rpath /foo -avoid-version], [], [ignore], [ignore])
+  AT_CHECK([$LIBTOOL --mode=link $CC -module $CFLAGS $LDFLAGS -o lib$name.la 
]dnl
+           [mod$name.lo $st -rpath /foo -avoid-version], [], [ignore], 
[ignore])
 done
 
 preloaded=
@@ -360,7 +367,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main 
main.$OBJEXT $preloa
 
 # Remove loadable libpreload module, so we know it is the preloaded module
 # that is being executed by a successful test invocation:
-$LIBTOOL --mode=clean rm libpreload.la
+AT_CHECK([$LIBTOOL --mode=clean rm -f libpreload.la], [], [ignore], [ignore])
 
 LT_AT_NOINST_EXEC_CHECK([./main], [$modules], [], [expout], [])
 


hooks/post-receive
--
GNU Libtool