new
This commit is contained in:
parent
a0144ff183
commit
394cc9ac6d
590
smmapdfw/config.guess
vendored
590
smmapdfw/config.guess
vendored
File diff suppressed because it is too large
Load Diff
5
smmapdfw/config.sub
vendored
5
smmapdfw/config.sub
vendored
@ -3,7 +3,7 @@
|
|||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2004-06-24'
|
timestamp='2004-08-29'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
@ -457,6 +457,9 @@ case $basic_machine in
|
|||||||
crds | unos)
|
crds | unos)
|
||||||
basic_machine=m68k-crds
|
basic_machine=m68k-crds
|
||||||
;;
|
;;
|
||||||
|
crisv32 | crisv32-* | etraxfs*)
|
||||||
|
basic_machine=crisv32-axis
|
||||||
|
;;
|
||||||
cris | cris-* | etrax*)
|
cris | cris-* | etrax*)
|
||||||
basic_machine=cris-axis
|
basic_machine=cris-axis
|
||||||
;;
|
;;
|
||||||
|
@ -43,9 +43,14 @@ EXIT_FAILURE=1
|
|||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=1.5.6
|
VERSION=1.5.10
|
||||||
TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $"
|
TIMESTAMP=" (1.1220.2.130 2004/09/19 12:13:49)"
|
||||||
|
|
||||||
|
# See if we are running on zsh, and set the options which allow our
|
||||||
|
# commands through without removal of \ escapes.
|
||||||
|
if test -n "${ZSH_VERSION+set}" ; then
|
||||||
|
setopt NO_GLOB_SUBST
|
||||||
|
fi
|
||||||
|
|
||||||
# Check that we have a working $echo.
|
# Check that we have a working $echo.
|
||||||
if test "X$1" = X--no-reexec; then
|
if test "X$1" = X--no-reexec; then
|
||||||
@ -235,6 +240,122 @@ func_infer_tag () {
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# func_extract_archives gentop oldlib ...
|
||||||
|
func_extract_archives () {
|
||||||
|
my_gentop="$1"; shift
|
||||||
|
my_oldlibs=${1+"$@"}
|
||||||
|
my_oldobjs=""
|
||||||
|
my_xlib=""
|
||||||
|
my_xabs=""
|
||||||
|
my_xdir=""
|
||||||
|
my_status=""
|
||||||
|
|
||||||
|
$show "${rm}r $my_gentop"
|
||||||
|
$run ${rm}r "$my_gentop"
|
||||||
|
$show "$mkdir $my_gentop"
|
||||||
|
$run $mkdir "$my_gentop"
|
||||||
|
my_status=$?
|
||||||
|
if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
|
||||||
|
exit $my_status
|
||||||
|
fi
|
||||||
|
|
||||||
|
for my_xlib in $my_oldlibs; do
|
||||||
|
# Extract the objects.
|
||||||
|
case $my_xlib in
|
||||||
|
[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
|
||||||
|
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||||
|
esac
|
||||||
|
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
||||||
|
my_xdir="$my_gentop/$my_xlib"
|
||||||
|
|
||||||
|
$show "${rm}r $my_xdir"
|
||||||
|
$run ${rm}r "$my_xdir"
|
||||||
|
$show "$mkdir $my_xdir"
|
||||||
|
$run $mkdir "$my_xdir"
|
||||||
|
status=$?
|
||||||
|
if test "$status" -ne 0 && test ! -d "$my_xdir"; then
|
||||||
|
exit $status
|
||||||
|
fi
|
||||||
|
case $host in
|
||||||
|
*-darwin*)
|
||||||
|
$show "Extracting $my_xabs"
|
||||||
|
# Do not bother doing anything if just a dry run
|
||||||
|
if test -z "$run"; then
|
||||||
|
darwin_orig_dir=`pwd`
|
||||||
|
cd $my_xdir || exit $?
|
||||||
|
darwin_archive=$my_xabs
|
||||||
|
darwin_curdir=`pwd`
|
||||||
|
darwin_base_archive=`basename $darwin_archive`
|
||||||
|
darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
|
||||||
|
if test -n "$darwin_arches"; then
|
||||||
|
darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
|
||||||
|
darwin_arch=
|
||||||
|
$show "$darwin_base_archive has multiple architectures $darwin_arches"
|
||||||
|
for darwin_arch in $darwin_arches ; do
|
||||||
|
mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
||||||
|
lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
|
||||||
|
# Remove the table of contents from the thin files.
|
||||||
|
$AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
|
||||||
|
$AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
|
||||||
|
cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
||||||
|
$AR -xo "${darwin_base_archive}"
|
||||||
|
rm "${darwin_base_archive}"
|
||||||
|
cd "$darwin_curdir"
|
||||||
|
done # $darwin_arches
|
||||||
|
## Okay now we have a bunch of thin objects, gotta fatten them up :)
|
||||||
|
darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
|
||||||
|
darwin_file=
|
||||||
|
darwin_files=
|
||||||
|
for darwin_file in $darwin_filelist; do
|
||||||
|
darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
|
||||||
|
lipo -create -output "$darwin_file" $darwin_files
|
||||||
|
done # $darwin_filelist
|
||||||
|
rm -rf unfat-$$
|
||||||
|
cd "$darwin_orig_dir"
|
||||||
|
else
|
||||||
|
cd $darwin_orig_dir
|
||||||
|
(cd $my_xdir && $AR x $my_xabs) || exit $?
|
||||||
|
fi # $darwin_arches
|
||||||
|
fi # $run
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# We will extract separately just the conflicting names and we will
|
||||||
|
# no longer touch any unique names. It is faster to leave these
|
||||||
|
# extract automatically by $AR in one run.
|
||||||
|
$show "(cd $my_xdir && $AR x $my_xabs)"
|
||||||
|
$run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
|
||||||
|
if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
|
||||||
|
$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
|
||||||
|
$AR t "$my_xabs" | sort | uniq -cd | while read -r count name
|
||||||
|
do
|
||||||
|
i=1
|
||||||
|
while test "$i" -le "$count"
|
||||||
|
do
|
||||||
|
# Put our $i before any first dot (extension)
|
||||||
|
# Never overwrite any file
|
||||||
|
name_to="$name"
|
||||||
|
while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
|
||||||
|
do
|
||||||
|
name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
|
||||||
|
done
|
||||||
|
$show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
|
||||||
|
$run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
|
||||||
|
i=`expr $i + 1`
|
||||||
|
done
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
||||||
|
done
|
||||||
|
|
||||||
|
func_extract_archives_result="$my_oldobjs"
|
||||||
|
}
|
||||||
# End of Shell function definitions
|
# End of Shell function definitions
|
||||||
#####################################
|
#####################################
|
||||||
|
|
||||||
@ -1838,10 +1959,7 @@ EOF
|
|||||||
case $pass in
|
case $pass in
|
||||||
dlopen) libs="$dlfiles" ;;
|
dlopen) libs="$dlfiles" ;;
|
||||||
dlpreopen) libs="$dlprefiles" ;;
|
dlpreopen) libs="$dlprefiles" ;;
|
||||||
link)
|
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
|
||||||
libs="$deplibs %DEPLIBS%"
|
|
||||||
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if test "$pass" = dlopen; then
|
if test "$pass" = dlopen; then
|
||||||
@ -1981,7 +2099,22 @@ EOF
|
|||||||
fi
|
fi
|
||||||
case $linkmode in
|
case $linkmode in
|
||||||
lib)
|
lib)
|
||||||
if test "$deplibs_check_method" != pass_all; then
|
valid_a_lib=no
|
||||||
|
case $deplibs_check_method in
|
||||||
|
match_pattern*)
|
||||||
|
set dummy $deplibs_check_method
|
||||||
|
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
|
||||||
|
if eval $echo \"$deplib\" 2>/dev/null \
|
||||||
|
| $SED 10q \
|
||||||
|
| $EGREP "$match_pattern_regex" > /dev/null; then
|
||||||
|
valid_a_lib=yes
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
pass_all)
|
||||||
|
valid_a_lib=yes
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "$valid_a_lib" != yes; then
|
||||||
$echo
|
$echo
|
||||||
$echo "*** Warning: Trying to link with static lib archive $deplib."
|
$echo "*** Warning: Trying to link with static lib archive $deplib."
|
||||||
$echo "*** I have the capability to make that library automatically link in when"
|
$echo "*** I have the capability to make that library automatically link in when"
|
||||||
@ -2154,10 +2287,17 @@ EOF
|
|||||||
absdir="$libdir"
|
absdir="$libdir"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
dir="$ladir/$objdir"
|
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
||||||
absdir="$abs_ladir/$objdir"
|
dir="$ladir"
|
||||||
# Remove this search path later
|
absdir="$abs_ladir"
|
||||||
notinst_path="$notinst_path $abs_ladir"
|
# Remove this search path later
|
||||||
|
notinst_path="$notinst_path $abs_ladir"
|
||||||
|
else
|
||||||
|
dir="$ladir/$objdir"
|
||||||
|
absdir="$abs_ladir/$objdir"
|
||||||
|
# Remove this search path later
|
||||||
|
notinst_path="$notinst_path $abs_ladir"
|
||||||
|
fi
|
||||||
fi # $installed = yes
|
fi # $installed = yes
|
||||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||||
|
|
||||||
@ -2933,11 +3073,6 @@ EOF
|
|||||||
age="$number_minor"
|
age="$number_minor"
|
||||||
revision="$number_minor"
|
revision="$number_minor"
|
||||||
;;
|
;;
|
||||||
*)
|
|
||||||
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
|
||||||
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
|
||||||
exit $EXIT_FAILURE
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
no)
|
no)
|
||||||
@ -2995,7 +3130,7 @@ EOF
|
|||||||
versuffix="$major.$age.$revision"
|
versuffix="$major.$age.$revision"
|
||||||
# Darwin ld doesn't like 0 for these options...
|
# Darwin ld doesn't like 0 for these options...
|
||||||
minor_current=`expr $current + 1`
|
minor_current=`expr $current + 1`
|
||||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
freebsd-aout)
|
freebsd-aout)
|
||||||
@ -3683,67 +3818,13 @@ EOF
|
|||||||
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
|
||||||
else
|
else
|
||||||
gentop="$output_objdir/${outputname}x"
|
gentop="$output_objdir/${outputname}x"
|
||||||
$show "${rm}r $gentop"
|
|
||||||
$run ${rm}r "$gentop"
|
|
||||||
$show "$mkdir $gentop"
|
|
||||||
$run $mkdir "$gentop"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
generated="$generated $gentop"
|
generated="$generated $gentop"
|
||||||
|
|
||||||
for xlib in $convenience; do
|
func_extract_archives $gentop $convenience
|
||||||
# Extract the objects.
|
libobjs="$libobjs $func_extract_archives_result"
|
||||||
case $xlib in
|
|
||||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
|
||||||
*) xabs=`pwd`"/$xlib" ;;
|
|
||||||
esac
|
|
||||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
|
||||||
xdir="$gentop/$xlib"
|
|
||||||
|
|
||||||
$show "${rm}r $xdir"
|
|
||||||
$run ${rm}r "$xdir"
|
|
||||||
$show "$mkdir $xdir"
|
|
||||||
$run $mkdir "$xdir"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
# We will extract separately just the conflicting names and we will no
|
|
||||||
# longer touch any unique names. It is faster to leave these extract
|
|
||||||
# automatically by $AR in one run.
|
|
||||||
$show "(cd $xdir && $AR x $xabs)"
|
|
||||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
|
||||||
if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
|
|
||||||
$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
|
|
||||||
$AR t "$xabs" | sort | uniq -cd | while read -r count name
|
|
||||||
do
|
|
||||||
i=1
|
|
||||||
while test "$i" -le "$count"
|
|
||||||
do
|
|
||||||
# Put our $i before any first dot (extension)
|
|
||||||
# Never overwrite any file
|
|
||||||
name_to="$name"
|
|
||||||
while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
|
|
||||||
do
|
|
||||||
name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
|
|
||||||
done
|
|
||||||
$show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
|
|
||||||
$run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
||||||
eval flag=\"$thread_safe_flag_spec\"
|
eval flag=\"$thread_safe_flag_spec\"
|
||||||
linker_flags="$linker_flags $flag"
|
linker_flags="$linker_flags $flag"
|
||||||
@ -3981,64 +4062,10 @@ EOF
|
|||||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||||
else
|
else
|
||||||
gentop="$output_objdir/${obj}x"
|
gentop="$output_objdir/${obj}x"
|
||||||
$show "${rm}r $gentop"
|
|
||||||
$run ${rm}r "$gentop"
|
|
||||||
$show "$mkdir $gentop"
|
|
||||||
$run $mkdir "$gentop"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
generated="$generated $gentop"
|
generated="$generated $gentop"
|
||||||
|
|
||||||
for xlib in $convenience; do
|
func_extract_archives $gentop $convenience
|
||||||
# Extract the objects.
|
reload_conv_objs="$reload_objs $func_extract_archives_result"
|
||||||
case $xlib in
|
|
||||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
|
||||||
*) xabs=`pwd`"/$xlib" ;;
|
|
||||||
esac
|
|
||||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
|
||||||
xdir="$gentop/$xlib"
|
|
||||||
|
|
||||||
$show "${rm}r $xdir"
|
|
||||||
$run ${rm}r "$xdir"
|
|
||||||
$show "$mkdir $xdir"
|
|
||||||
$run $mkdir "$xdir"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
# We will extract separately just the conflicting names and we will no
|
|
||||||
# longer touch any unique names. It is faster to leave these extract
|
|
||||||
# automatically by $AR in one run.
|
|
||||||
$show "(cd $xdir && $AR x $xabs)"
|
|
||||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
|
||||||
if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
|
|
||||||
$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
|
|
||||||
$AR t "$xabs" | sort | uniq -cd | while read -r count name
|
|
||||||
do
|
|
||||||
i=1
|
|
||||||
while test "$i" -le "$count"
|
|
||||||
do
|
|
||||||
# Put our $i before any first dot (extension)
|
|
||||||
# Never overwrite any file
|
|
||||||
name_to="$name"
|
|
||||||
while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
|
|
||||||
do
|
|
||||||
name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
|
|
||||||
done
|
|
||||||
$show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
|
|
||||||
$run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -4819,7 +4846,7 @@ sed_quote_subst='$sed_quote_subst'
|
|||||||
|
|
||||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||||
# if CDPATH is set.
|
# if CDPATH is set.
|
||||||
if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||||
|
|
||||||
relink_command=\"$relink_command\"
|
relink_command=\"$relink_command\"
|
||||||
|
|
||||||
@ -4996,65 +5023,10 @@ fi\
|
|||||||
|
|
||||||
if test -n "$addlibs"; then
|
if test -n "$addlibs"; then
|
||||||
gentop="$output_objdir/${outputname}x"
|
gentop="$output_objdir/${outputname}x"
|
||||||
$show "${rm}r $gentop"
|
|
||||||
$run ${rm}r "$gentop"
|
|
||||||
$show "$mkdir $gentop"
|
|
||||||
$run $mkdir "$gentop"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
generated="$generated $gentop"
|
generated="$generated $gentop"
|
||||||
|
|
||||||
# Add in members from convenience archives.
|
func_extract_archives $gentop $addlibs
|
||||||
for xlib in $addlibs; do
|
oldobjs="$oldobjs $func_extract_archives_result"
|
||||||
# Extract the objects.
|
|
||||||
case $xlib in
|
|
||||||
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
|
|
||||||
*) xabs=`pwd`"/$xlib" ;;
|
|
||||||
esac
|
|
||||||
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
|
|
||||||
xdir="$gentop/$xlib"
|
|
||||||
|
|
||||||
$show "${rm}r $xdir"
|
|
||||||
$run ${rm}r "$xdir"
|
|
||||||
$show "$mkdir $xdir"
|
|
||||||
$run $mkdir "$xdir"
|
|
||||||
status=$?
|
|
||||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
|
||||||
exit $status
|
|
||||||
fi
|
|
||||||
# We will extract separately just the conflicting names and we will no
|
|
||||||
# longer touch any unique names. It is faster to leave these extract
|
|
||||||
# automatically by $AR in one run.
|
|
||||||
$show "(cd $xdir && $AR x $xabs)"
|
|
||||||
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
|
|
||||||
if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
|
|
||||||
$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
|
|
||||||
$AR t "$xabs" | sort | uniq -cd | while read -r count name
|
|
||||||
do
|
|
||||||
i=1
|
|
||||||
while test "$i" -le "$count"
|
|
||||||
do
|
|
||||||
# Put our $i before any first dot (extension)
|
|
||||||
# Never overwrite any file
|
|
||||||
name_to="$name"
|
|
||||||
while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
|
|
||||||
do
|
|
||||||
name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
|
|
||||||
done
|
|
||||||
$show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
|
|
||||||
$run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Do each command in the archive commands.
|
# Do each command in the archive commands.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user