diff options
| author | Karsten Hopp <karsten@fedoraproject.org> | 2007-07-27 11:12:12 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@fedoraproject.org> | 2007-07-27 11:12:12 +0000 |
| commit | dfb30ff597cf2a018d68731239abc3e277e895ae (patch) | |
| tree | 02938bb4f673bf78ec649efe1c4f832013223f2e /libtool-1.5.22-misc.patch | |
| parent | 2d8e40b31eb4cfde97e312615ea7af7d58c9183e (diff) | |
| download | libtool-dfb30ff597cf2a018d68731239abc3e277e895ae.tar.gz libtool-dfb30ff597cf2a018d68731239abc3e277e895ae.tar.xz libtool-dfb30ff597cf2a018d68731239abc3e277e895ae.zip | |
-update to 1.5.24
Diffstat (limited to 'libtool-1.5.22-misc.patch')
| -rw-r--r-- | libtool-1.5.22-misc.patch | 403 |
1 files changed, 0 insertions, 403 deletions
diff --git a/libtool-1.5.22-misc.patch b/libtool-1.5.22-misc.patch deleted file mode 100644 index e0e8030..0000000 --- a/libtool-1.5.22-misc.patch +++ /dev/null @@ -1,403 +0,0 @@ ---- libtool-1.5.22/ltmain.in.rh1 2006-06-08 12:37:19.000000000 +0200 -+++ libtool-1.5.22/ltmain.in 2006-06-08 13:15:59.000000000 +0200 -@@ -46,10 +46,16 @@ - VERSION=@VERSION@ - TIMESTAMP="@TIMESTAMP@" - --# 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 -+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac - fi - - # Check that we have a working $echo. -@@ -105,12 +111,14 @@ - # These must not be set unconditionally because not all systems understand - # e.g. LANG=C (notably SCO). - # We save the old values to restore during execute mode. --if test "${LC_ALL+set}" = set; then -- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL --fi --if test "${LANG+set}" = set; then -- save_LANG="$LANG"; LANG=C; export LANG --fi -+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+do -+ eval "if test \"\${$lt_var+set}\" = set; then -+ save_$lt_var=\$$lt_var -+ $lt_var=C -+ export $lt_var -+ fi" -+done - - # Make sure IFS has a sensible default - lt_nl=' -@@ -136,6 +144,8 @@ - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 - - ##################################### - # Shell function definitions: -@@ -327,7 +337,17 @@ - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -- my_xdir="$my_gentop/$my_xlib" -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ extracted_serial=`expr $extracted_serial + 1` -+ my_xlib_u=lt$extracted_serial-$my_xlib ;; -+ *) break ;; -+ esac -+ done -+ extracted_archives="$extracted_archives $my_xlib_u" -+ my_xdir="$my_gentop/$my_xlib_u" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" -@@ -758,6 +778,7 @@ - *.f90) xform=f90 ;; - *.for) xform=for ;; - *.java) xform=java ;; -+ *.obj) xform=obj ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -@@ -1138,8 +1159,9 @@ - for arg - do - case $arg in -- -all-static | -static) -- if test "X$arg" = "X-all-static"; then -+ -all-static | -static | -static-libtool-libs) -+ case $arg in -+ -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi -@@ -1147,12 +1169,20 @@ - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes -- else -+ ;; -+ -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built -- fi -+ ;; -+ -static-libtool-libs) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ esac - build_libtool_libs=no - build_old_libs=yes - break -@@ -1712,7 +1742,7 @@ - continue - ;; - -- -static) -+ -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects -@@ -2490,7 +2520,9 @@ - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && -- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then -+ { { test "$prefer_static_libs" = no || -+ test "$prefer_static_libs,$installed" = "built,yes"; } || -+ test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. -@@ -3186,7 +3218,7 @@ - # which has an extra 1 added just for fun - # - case $version_type in -- darwin|linux|osf|windows) -+ darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" -@@ -3410,11 +3442,11 @@ - fi - - # Eliminate all temporary directories. -- for path in $notinst_path; do -- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -- done -+# for path in $notinst_path; do -+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -+# done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -3515,13 +3547,12 @@ - int main() { return 0; } - EOF - $rm conftest -- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs -- if test "$?" -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then - ldd_output=`ldd conftest` - for i in $deplibs; do - name=`expr $i : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. -- if test "$name" != "" && test "$name" -ne "0"; then -+ if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -@@ -3560,9 +3591,7 @@ - # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then - $rm conftest -- $LTCC $LTCFLAGS -o conftest conftest.c $i -- # Did it work? -- if test "$?" -eq 0 ; then -+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in -@@ -3594,7 +3623,7 @@ - droppeddeps=yes - $echo - $echo "*** Warning! Library $i is needed by this library but I was not able to" -- $echo "*** make it link in! You will probably need to install it or some" -+ $echo "*** make it link in! You will probably need to install it or some" - $echo "*** library that it depends on before this library will be fully" - $echo "*** functional. Installing it before continuing would be even better." - fi -@@ -4239,12 +4268,14 @@ - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then -- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" -+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" -@@ -4692,16 +4723,16 @@ - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) -- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac - ;; -@@ -4716,13 +4747,13 @@ - # really was required. - - # Nullify the symbol file. -- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. -- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. -@@ -4809,7 +4840,7 @@ - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= -@@ -4846,7 +4877,7 @@ - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. -@@ -5253,6 +5284,18 @@ - Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - -+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -+fi -+ - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -@@ -5395,7 +5438,7 @@ - ;; - esac - $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" -+ \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - fi - else -@@ -5581,7 +5624,7 @@ - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi -@@ -5926,9 +5969,9 @@ - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` - else -- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 -@@ -6137,7 +6180,7 @@ - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` - - $show "$relink_command" - if $run eval "$relink_command"; then : -@@ -6413,12 +6456,13 @@ - fi - - # Restore saved environment variables -- if test "${save_LC_ALL+set}" = set; then -- LC_ALL="$save_LC_ALL"; export LC_ALL -- fi -- if test "${save_LANG+set}" = set; then -- LANG="$save_LANG"; export LANG -- fi -+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+ do -+ eval "if test \"\${save_$lt_var+set}\" = set; then -+ $lt_var=\$save_$lt_var; export $lt_var -+ fi" -+ done -+ - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" -@@ -6775,9 +6821,9 @@ - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE -- try to export only the symbols listed in SYMFILE -+ try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX -- try to export only the symbols matching REGEX -+ try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened -@@ -6791,9 +6837,11 @@ - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -- -static do not do any dynamic linking of libtool libraries -+ -static do not do any dynamic linking of uninstalled libtool libraries -+ -static-libtool-libs -+ do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] -- specify library version info [each variable defaults to 0] -+ specify library version info [each variable defaults to 0] - - All other options (arguments beginning with \`-') are ignored. - ---- libtool-1.5.22/libtool.m4.rh1 2006-06-08 12:32:23.000000000 +0200 -+++ libtool-1.5.22/libtool.m4 2006-06-08 12:36:53.000000000 +0200 -@@ -6378,6 +6378,7 @@ - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris -@@ -6410,5 +6411,6 @@ - done - ]) - SED=$lt_cv_path_SED -+AC_SUBST([SED]) - AC_MSG_RESULT([$SED]) - ]) ---- libtool-1.5.22/libltdl/ltdl.c.syntax1 2006-06-08 12:02:39.000000000 +0200 -+++ libtool-1.5.22/libltdl/ltdl.c 2006-06-08 12:03:09.000000000 +0200 -@@ -894,7 +894,7 @@ - (*lt_dlmutex_seterror_func) (errormsg); \ - else lt_dllast_error = (errormsg); } LT_STMT_END - #define LT_DLMUTEX_GETERROR(errormsg) LT_STMT_START { \ -- if (lt_dlmutex_seterror_func) \ -+ if (lt_dlmutex_geterror_func) \ - (errormsg) = (*lt_dlmutex_geterror_func) (); \ - else (errormsg) = lt_dllast_error; } LT_STMT_END - |
