mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-03-31 16:10:35 +08:00
* libltdl/m4/libtool.m4 (old_archive_cmds): Remove
old_deplibs. * tests/dmacks.at: Check for archives as members of static archives. Currently XFAILS, above only eliminates one of the two static archives. * Makefile.am: Add test. Reported by Daniel Macks <dmacks@netspace.org>
This commit is contained in:
parent
c4baa9d16e
commit
85b6058c22
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2007-06-03 Peter O'Gorman <peter@pogma.com>
|
||||
|
||||
* libltdl/m4/libtool.m4 (old_archive_cmds): Remove
|
||||
old_deplibs.
|
||||
* tests/dmacks.at: Check for archives as members of static
|
||||
archives. Currently XFAILS, above only eliminates one of the
|
||||
two static archives.
|
||||
* Makefile.am: Add test.
|
||||
Reported by Daniel Macks <dmacks@netspace.org>
|
||||
|
||||
2007-06-01 Steve Ellcey <sje@cup.hp.com>
|
||||
|
||||
* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): Try using getconf
|
||||
|
@ -441,6 +441,7 @@ TESTSUITE_AT = tests/testsuite.at \
|
||||
tests/export.at \
|
||||
tests/search-path.at \
|
||||
tests/indirect_deps.at \
|
||||
tests/archive-in-archive.at \
|
||||
tests/destdir.at \
|
||||
tests/old-m4-iface.at \
|
||||
tests/am-subdir.at \
|
||||
|
2
libltdl/m4/libtool.m4
vendored
2
libltdl/m4/libtool.m4
vendored
@ -1232,7 +1232,7 @@ _LT_DECL([], [RANLIB], [1],
|
||||
[Commands used to install an old-style archive])
|
||||
|
||||
# Determine commands to create old-style static archives.
|
||||
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
|
||||
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
|
||||
old_postinstall_cmds='chmod 644 $oldlib'
|
||||
old_postuninstall_cmds=
|
||||
|
||||
|
51
tests/archive-in-archive.at
Normal file
51
tests/archive-in-archive.at
Normal file
@ -0,0 +1,51 @@
|
||||
# dmacks.at -- test for dmacks bug -*- Autotest -*-
|
||||
#
|
||||
# Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
# Written by Peter O'Gorman, 2007
|
||||
#
|
||||
# This file is part of GNU Libtool.
|
||||
#
|
||||
# GNU Libtool is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# GNU Libtool is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with GNU Libtool; see the file COPYING. If not, a copy
|
||||
# can be downloaded from http://www.gnu.org/licenses/gpl.html,
|
||||
# or obtained by writing to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
####
|
||||
|
||||
|
||||
AT_SETUP([static library contains static library])
|
||||
AT_KEYWORDS([libtool])
|
||||
|
||||
AT_DATA([foo.c],
|
||||
[
|
||||
int foo() { return 1;}
|
||||
])
|
||||
|
||||
AT_DATA([bar.c],
|
||||
[
|
||||
int bar() { return 1;}
|
||||
])
|
||||
|
||||
thisdir=`cd . && pwd`
|
||||
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o foo.lo foo.c
|
||||
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
|
||||
$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
|
||||
-o libfoo.la foo.lo -version-info 1:0:0 -rpath $thisdir
|
||||
$LIBTOOL --mode=install cp libfoo.la $thisdir
|
||||
$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
|
||||
-o libbar.la bar.lo ./libfoo.a -version-info 1:0:0 -rpath $thisdir
|
||||
$LIBTOOL --mode=install cp libbar.la $thisdir
|
||||
AT_CHECK([ar -t libbar.a | grep libfoo.a],[1],[ignore],[ignore])
|
||||
archive_contents=`ar -t libbar.a`
|
||||
AT_XFAIL_IF([case "$archive_contents" in *"libfoo.a"*) : ;; esac])
|
||||
AT_CLEANUP
|
Loading…
x
Reference in New Issue
Block a user