mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-12-09 06:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverted incorrect patch:

Browse Source 
2001-10-24  H.J. Lu  <hjl@gnu.org>
* ltmain.sh: Allow link against an archive when building a
shared library.
* libtool.m4 (lt_cv_deplibs_check_method): Always use
file_magic for Linux ELF.
This commit is contained in:
Alexandre Oliva 2002-02-07 19:54:36 +00:00
parent 558143b58d
commit c2c0bd8ada
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-02-07 Alexandre Oliva <aoliva@redhat.com>
Reverted incorrect patch:
2001-10-24 H.J. Lu <hjl@gnu.org>
* ltmain.sh: Allow link against an archive when building a
shared library.
* libtool.m4 (lt_cv_deplibs_check_method): Always use
file_magic for Linux ELF.
2002-01-30 Robert Boehne <rboehne@ricardo-us.com>
* libtool.m4 (LT_AC_PROG_SED): Removed a mysterious newline.

1
libtool.m4 vendored
View File

@ -1949,7 +1949,6 @@ linux*)
# glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
esac
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;;

7
ltmain.in
View File

@ -2990,13 +2990,6 @@ EOF
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
# It is ok to link against an archive when
# building a shared library.
if $AR -t $potlib > /dev/null 2>&1; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
fi
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
| ${SED} 10q \
| egrep "$file_magic_regex" > /dev/null; then