mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-03-01 15:25:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* tests/Makefile.am (TESTS): Delete references to depdemo-dups.test.

Browse Source 
* tests/depdemo-dups.test:  Removed, as part of the patch
reversion below.
* ltmain.in: Revert my change from 2001-03-31.  Although it
was technically correct, it opens a whole can of worms we don't
want to deal with right now.
This commit is contained in:
Gary V. Vaughan 2001-04-05 23:09:38 +00:00
parent 1d08896a95
commit b054ed6edd
4 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2001-04-05 Gary V. Vaughan <gvv@techie.com>
* tests/Makefile.am (TESTS): Delete references to depdemo-dups.test.
* tests/depdemo-dups.test: Removed, as part of the patch
reversion below.
* ltmain.in: Revert my change from 2001-03-31. Although it
was technically correct, it opens a whole can of worms we don't
want to deal with right now.
From Ahmed Masud <masud@googgun.com>
* libltdl/ltdl.c (sys_shl_open): Return a NULL module handle
for self opening.

21
ltmain.in
View File

@ -2062,7 +2062,26 @@ compiler."
eval tmp_libs=\"\$$var\"
new_libs=
for deplib in $tmp_libs; do
new_libs="$deplib $new_libs"
# FIXME: Pedantically, this is the right thing to do, so
# that some nasty dependency loop isn't accidentally
# broken:
#new_libs="$deplib $new_libs"
# Pragmatically, this seems to cause very few problems in
# practice:
case $deplib in
-L*) new_libs="$deplib $new_libs" ;;
*)
case " $specialdeplibs " in
*" $deplib "*) new_libs="$deplib $new_libs" ;;
*)
case " $new_libs " in
*" $deplib "*) ;;
*) new_libs="$deplib $new_libs" ;;
esac
;;
esac
;;
esac
done
tmp_libs=
for deplib in $new_libs; do

8
tests/Makefile.am
View File

@ -5,14 +5,14 @@ AUTOMAKE_OPTIONS = gnits
TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
demo-static.test demo-make.test demo-exec.test \
demo-inst.test demo-unst.test \
depdemo-static.test depdemo-make.test depdemo-dups.test \
depdemo-static.test depdemo-make.test \
depdemo-exec.test depdemo-inst.test depdemo-unst.test \
mdemo-static.test mdemo-make.test mdemo-exec.test \
mdemo-inst.test mdemo-unst.test \
cdemo-conf.test cdemo-make.test cdemo-exec.test \
demo-conf.test demo-make.test demo-exec.test \
demo-inst.test demo-unst.test deplibs.test \
depdemo-conf.test depdemo-make.test depdemo-dups.test \
depdemo-conf.test depdemo-make.test \
depdemo-exec.test depdemo-inst.test depdemo-unst.test \
mdemo-conf.test mdemo-make.test mdemo-exec.test \
mdemo-inst.test mdemo-unst.test dryrun.test \
@ -20,12 +20,12 @@ TESTS = cdemo-static.test cdemo-make.test cdemo-exec.test \
demo-inst.test demo-unst.test \
demo-pic.test demo-make.test demo-exec.test \
demo-nopic.test demo-make.test demo-exec.test \
depdemo-nofast.test depdemo-make.test depdemo-dups.test \
depdemo-nofast.test depdemo-make.test \
depdemo-exec.test depdemo-inst.test depdemo-unst.test \
cdemo-shared.test cdemo-make.test cdemo-exec.test \
demo-shared.test demo-make.test demo-exec.test demo-inst.test \
hardcode.test build-relink.test noinst-link.test demo-unst.test \
depdemo-shared.test depdemo-make.test depdemo-dups.test \
depdemo-shared.test depdemo-make.test \
depdemo-exec.test depdemo-inst.test build-relink2.test \
depdemo-unst.test \
mdemo-shared.test mdemo-make.test mdemo-exec.test \

39
tests/depdemo-dups.test
View File

@ -1,39 +0,0 @@
#! /bin/sh
# depdemo-dups.test - check that duplicate deplibs are not removed
# Test script header.
need_prefix=no
if test -z "$srcdir"; then
srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
test "$srcdir" = "$0" && srcdir=.
test "${VERBOSE+set}" != "set" && VERBOSE=yes
fi
. $srcdir/defs || exit 1
status=:
# Check that things are built
if test -f ../depdemo/l2/libl2.la; then :
else
echo "You must run depdemo-make.test before $0" 1>&2
exit 77
fi
# Change to our build directory.
cd ../depdemo || exit 1
# Try to link with a library, and explicitly name its deplibs
pwd=`pwd`
result=`$libtool -n --mode=link gcc -o something $pwd/l2/libl2.la $pwd/l1/libl1.la` || status=false
$status || exit 1
echo "$result"
case "$result" in
*/libl1.*/libl1.*) ;;
*)
echo "$0: duplicate deplibs should not be removed."
exit 1
;;
esac
exit 0