[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. release-2-2-2-27-g4f2021d
From: |
Ralf Wildenhues |
Subject: |
[SCM] GNU Libtool branch, master, updated. release-2-2-2-27-g4f2021d |
Date: |
Wed, 23 Apr 2008 21:49:39 +0000 |
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 4f2021de12cf4756b5d6b235560092e5cce0094c (commit)
from 08015bb3c9d8c86493d0f5dff9b3a3e40136cf6b (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 4f2021de12cf4756b5d6b235560092e5cce0094c
Author: Michael Haubenwallner <address@hidden>
Date: Wed Apr 23 23:48:46 2008 +0200
Use /nonexistent as destination for files not to be installed.
* tests/darwin.at (darwin fat compile): Fix typo.
* tests/inherited_flags.at (inherited_linker_flags): Change
-rpath to /nonexistent. This helps to avoid accidentally
picking up libraries below /usr/local.
* tests/template.at (simple template test): Likewise. Fixes
test failure for additional incompatible libstdc++ in
/usr/local.
* tests/testsuite.at (configure_options): Add
--prefix=/nonexistent.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 ++++++++++++++-
tests/darwin.at | 2 +-
tests/inherited_flags.at | 18 +++++++++---------
tests/template.at | 4 ++--
tests/testsuite.at | 2 +-
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f984f21..9e97b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-23 Michael Haubenwallner <address@hidden>
+
+ Use /nonexistent as destination for files not to be installed.
+ * tests/darwin.at (darwin fat compile): Fix typo.
+ * tests/inherited_flags.at (inherited_linker_flags): Change
+ -rpath to /nonexistent. This helps to avoid accidentally
+ picking up libraries below /usr/local.
+ * tests/template.at (simple template test): Likewise. Fixes
+ test failure for additional incompatible libstdc++ in
+ /usr/local.
+ * tests/testsuite.at (configure_options): Add
+ --prefix=/nonexistent.
+
2008-04-23 Gary V. Vaughan <address@hidden>
* libtoolize.m4sh (rerun_aclocal): Remove unused variable.
@@ -29,7 +42,7 @@
* THANKS: Update.
Report by Richard Purdie.
-2008-04-22 Andreas Schwab <address@hidden>
+2008-04-22 Andreas Schwab <address@hidden>
Ralf Wildenhues <address@hidden>
Fix default argument for AC_LIBLTDL_CONVENIENCE.
diff --git a/tests/darwin.at b/tests/darwin.at
index adc0db6..7e6d07e 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -86,7 +86,7 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libfoo.la
$CPPFLAGS $CFLAGS $LDFL
AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o bar.lo $CPPFLAGS $CFLAGS
-arch ppc -arch i386 bar.c],[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libbar.la $CPPFLAGS $CFLAGS
$LDFLAGS -arch ppc -arch i386 bar.lo libfoo.la -rpath
/nonexistant],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libbar.la $CPPFLAGS $CFLAGS
$LDFLAGS -arch ppc -arch i386 bar.lo libfoo.la -rpath
/nonexistent],[0],[ignore],[ignore])
AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o main.lo $CPPFLAGS $CFLAGS
-arch ppc -arch i386 main.c],[0],[ignore],[ignore])
diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index 7a2fc4e..1efdf16 100644
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -1,6 +1,6 @@
# inherited_flags.at -- test inherited_linker_flags -*- Autotest -*-
#
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Peter O'Garman, 2005
#
# This file is part of GNU Libtool.
@@ -56,9 +56,9 @@ $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o
bar.lo bar.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o baz.lo baz.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o both.lo both.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libfoo.la foo.lo -rpath
/usr/local/lib -no-undefined
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo -rpath
/usr/local/lib -no-undefined
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libboth.la both.lo
-rpath /usr/local/lib -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libfoo.la foo.lo -rpath
/nonexistent -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo -rpath
/nonexistent -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libboth.la both.lo
-rpath /nonexistent -no-undefined
mv libfoo.la libfoo.la.bak
@@ -73,7 +73,7 @@ mv libboth.la libboth.la.bak
sed -e
"s/^inherited_linker_flags.*/inherited_linker_flags='-llt_inlikely_existing_lib
-llt_unlikely_existing_lib'/g" < libboth.la.bak > libboth.la
rm libboth.la.bak
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la],
[ignore],[stdout],[ignore])
# We used to grep for
# 'llt_[[ui]]nlikely_existing_lib.*llt_[[ui]]nlikely_existing_lib'
@@ -82,19 +82,19 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS
$LDFLAGS -o libbaz.la baz.lo
AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
[1], [ignore])
AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib'
stdout],
[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib'
stdout],
[0],[ignore],[ignore])
# now check for duplicates
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la
./libboth.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
[1],[ignore],[ignore])
AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
[1],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
[1],[ignore],[ignore])
@@ -105,7 +105,7 @@ mv libboth.la libboth.la.bak
sed "s/^inherited_linker_flags.*/inherited_linker_flags='-framework Cocoa
-framework ApplicationServices'/" < libboth.la.bak > libboth.la
rm libboth.la.bak
-AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework
Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la
-no-undefined -rpath /usr/local/lib],
+AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework
Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la
-no-undefined -rpath /nonexistent],
[], [stdout], [ignore])
AT_CHECK([grep Cocoa.ltframework stdout], [1], [], [])
AT_CHECK([grep ' -framework Cocoa' stdout], [0], [ignore], [])
diff --git a/tests/template.at b/tests/template.at
index 9fc71f5..cc730ff 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -1,6 +1,6 @@
# template.at -- test C++ templates with libtool -*- Autotest -*-
#
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Markus Christen, 2005
#
# This file is part of GNU Libtool.
@@ -82,7 +82,7 @@ AT_CHECK([$LIBTOOL --tag=CXX --mode=compile $CXX -I.
$CPPFLAGS $CXXFLAGS -c -o a
[0], [ignore], [ignore])
AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libaclib.la aclib.lo],
[0], [ignore], [ignore])
-AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libalib.la -rpath /usr/local/lib alib.lo libaclib.la],
+AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libalib.la -rpath /nonexistent alib.lo libaclib.la],
[0], [ignore], [ignore])
AT_CHECK([$CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp],
[0], [ignore], [ignore])
diff --git a/tests/testsuite.at b/tests/testsuite.at
index e4cea78..14a604e 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -36,7 +36,7 @@ done
export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
eval `$LIBTOOL --config | grep '^EGREP='`
eval `$LIBTOOL --config | $EGREP
'^(host|host_os|host_alias|build|build_alias|ECHO)='`
-configure_options=
+configure_options=--prefix=/nonexistent
if test -n "$host_alias"; then
configure_options="$configure_options --host $host_alias"
fi
hooks/post-receive
--
GNU Libtool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. release-2-2-2-27-g4f2021d,
Ralf Wildenhues <=