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

Merge branch 'gary/reredo-test-operand-order'

Browse Source 
The original manually applied changeset 962aa91 contained several
errors (some corrected by subsequent patches on master, others not)
and many unrelated (although in this case, correct) changes were also
committed in the same changeset.

The merged branch gary/reredo-test-operand-order factors the
unrelated changes out into separate commits, and performs the work
that should have been in 962aa91 with a script, the results of which
were then painstakingly inspected for errors.

This merge moves the corrections for errors made in the original
manual patch from the branch onto master.  Please inspect the many
separate changesets on the branch rather than the original patch
when you bisect or otherwise find your way to an error caused by
962aa91.
This commit is contained in:
Gary V. Vaughan 2012-10-03 11:49:27 +07:00
commit 0b1b671864
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bootstrap
View File

@ -930,7 +930,7 @@ func_require_bootstrap_uptodate ()
$require_gnulib_path
test x = x"$gnulib_path" \
test -z "$gnulib_path" \
|| func_cmp_s $progpath $gnulib_path/build-aux/bootstrap \
|| func_warning upgrade "\
\`$progpath' differs from \`./$gnulib_path/build-aux/bootstrap',
@ -1684,7 +1684,7 @@ func_require_source_base ()
$require_gnulib_cache
test -f "$gnulib_cache" && test x = "x$source_base" && {
test -f "$gnulib_cache" && test -z "$source_base" && {
$require_macro_dir
func_extract_trace "gl_SOURCE_BASE" "$gnulib_cache"
@ -1709,7 +1709,7 @@ func_require_vc_ignore_files ()
test -n "$vc_ignore" || vc_ignore=auto
if test auto = "$vc_ignore" && test x = x"$vc_ignore_files"; then
if test auto = "$vc_ignore" && test -z "$vc_ignore_files"; then
vc_ignore_files=
test -d .git && vc_ignore_files=.gitignore
test -d CVS && vc_ignore_files="$vc_ignore_files .cvsignore"
@ -1820,7 +1820,7 @@ func_ifcontains ()
;;
esac
test 0 -eq $_G_status || exit $_G_status
test 0 -eq "$_G_status" || exit $_G_status
}
@ -2056,7 +2056,7 @@ func_show_eval ()
${opt_dry_run-'false'} || {
eval "$_G_cmd"
_G_status=$?
test 0 -eq $_G_status || eval "(exit $_G_status); $_G_fail_exp"
test 0 -eq "$_G_status" || eval "(exit $_G_status); $_G_fail_exp"
}
}
@ -2202,7 +2202,7 @@ func_get_version ()
func_tool_version_output $_G_app >/dev/null
_G_status=$?
test 0 -ne $_G_status \
test 0 -ne "$_G_status" \
|| $_G_app --version 2>&1 |$SED -n "$sed_get_version"
(exit $_G_status)
@ -2237,7 +2237,7 @@ func_check_versions ()
func_check_versions_result=false
# Fail if a new version than what we have is required.
elif test "$_G_reqver" != -; then
elif test x- != "x$_G_reqver"; then
_G_newer=`func_sort_ver $_G_reqver $_G_instver |cut -d' ' -f2`
test "$_G_newer" != "$_G_instver" && {
func_error "\

4
build-aux/extract-trace
View File

@ -86,7 +86,7 @@ func_autoconf_configure ()
test -n "$_G_ac_init"
_G_status=$?
test 0 -ne $_G_status \
test 0 -ne "$_G_status" \
&& func_verbose "\`$1' not using Autoconf"
(exit $_G_status)
@ -161,7 +161,7 @@ func_tool_version_output ()
{ $_G_cmd --version </dev/null || $_G_cmd --version; } 2>/dev/null
_G_status=$?
test 0 -ne $_G_status && test -n "$_G_fatal_error_msg" \
test 0 -ne "$_G_status" && test -n "$_G_fatal_error_msg" \
&& func_fatal_error "$_G_fatal_error_msg"
(exit $_G_status)

4
build-aux/general.m4sh
View File

@ -45,7 +45,7 @@ progpath=$0
M4SH_VERBATIM([[
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
test set = "${ECHO+set}" || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="@EGREP@"}
: ${FGREP="@FGREP@"}
: ${GREP="@GREP@"}
@ -692,7 +692,7 @@ func_show_eval ()
if ${opt_dry_run-false}; then :; else
eval "$my_cmd"
my_status=$?
if test 0 -eq $my_status; then :; else
if test 0 -eq "$my_status"; then :; else
eval "(exit $my_status); $my_fail_exp"
fi
fi

20
build-aux/ltmain.m4sh
View File

@ -1350,7 +1350,7 @@ func_mode_compile ()
pic_mode=default
;;
esac
if test yes = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
@ -5151,7 +5151,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
if test dlfiles = "$prev"; then
if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@ -5717,8 +5717,8 @@ func_mode_link ()
# This library was specified with -dlopen.
if test dlopen = "$pass"; then
test -n "$libdir" \
|| func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
test -z "$libdir" \
&& func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
if test -z "$dlname" ||
test yes != "$dlopen_support" ||
test no = "$build_libtool_libs"
@ -6191,7 +6191,7 @@ func_mode_link ()
fi
elif test yes = "$build_libtool_libs"; then
# Not a shared library
if test pass_all = "$deplibs_check_method"; then
if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
@ -6487,8 +6487,8 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
test yes = "$module" \
|| func_fatal_help "libtool library \`$output' must begin with \`lib'"
test no = "$module" \
&& func_fatal_help "libtool library \`$output' must begin with \`lib'"
if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
@ -6519,8 +6519,8 @@ func_mode_link ()
set dummy $rpath
shift
test "$#" -gt 1 && \
func_warning "ignoring multiple \`-rpath's for a libtool library"
test 1 -lt "$#" \
&& func_warning "ignoring multiple \`-rpath's for a libtool library"
install_libdir=$1
@ -7458,7 +7458,7 @@ EOF
fi
done
IFS=$save_ifs
if test -n "$export_symbols_regex" && : != "$skipped_export"; then
if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi

2
libtoolize.m4sh
View File

@ -1085,7 +1085,7 @@ func_autoconf_configure ()
test -n "$_G_ac_init"
_G_status=$?
test 0 -ne $_G_status \
test 0 -ne "$_G_status" \
&& func_verbose "\`$1' not using Autoconf"
(exit $_G_status)

6
m4/argz.m4
View File

@ -55,11 +55,11 @@ AS_IF([test -z "$ARGZ_H"],
lt_os_major=${2-0}
lt_os_minor=${3-0}
lt_os_micro=${4-0}
if test 1 -le "$lt_os_major" \
if test 1 -lt "$lt_os_major" \
|| { test 1 -eq "$lt_os_major" \
&& { test 5 -le "$lt_os_minor" \
&& { test 5 -lt "$lt_os_minor" \
|| { test 5 -eq "$lt_os_minor" \
&& test 24 -le "$lt_os_micro"; }; }; }; then
&& test 24 -lt "$lt_os_micro"; }; }; }; then
lt_cv_sys_argz_works=yes
fi
fi

10
m4/libtool.m4 vendored
View File

@ -1124,7 +1124,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
if test "${lt_cv_aix_libpath+set}" = set; then
if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@ -1704,7 +1704,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test 17 != "$i" # 1/2 MB should be enough
do
@ -2861,10 +2861,10 @@ if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
@ -7730,7 +7730,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
test 10 -le "$lt_ac_count" && break
test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count

4
tests/tagtrace.test
View File

@ -35,10 +35,10 @@ fi
( cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
ret=$?
if test 63 -eq $ret || test 1 -eq $ret; then
if test 63 -eq "$ret" || test 1 -eq "$ret"; then
func_error "This test requires the same Autoconf version"
func_skip "as the one that was used to bootstrap Libtool"
elif test 0 -ne $ret; then
elif test 0 -ne "$ret"; then
func_fatal_error "\`$AUTOCONF --trace' exited $ret"
fi

2
tests/testsuite.at
View File

@ -29,7 +29,7 @@ m4_divert_push([PREPARE_TESTS])dnl
: ${AUTOCONF=autoconf}
: ${AUTOMAKE=automake}
: ${AUTORECONF=autoreconf}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
test set = "${ECHO+set}" || ECHO=${as_echo-'printf %s\n'}
: ${ECHO=$as_echo}
for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do
if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi