bug-libtool
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Solaris patch for libtool 1.4.2


From: Petter Reinholdtsen
Subject: Solaris patch for libtool 1.4.2
Date: Tue, 4 Jun 2002 11:52:29 +0200

I ran into a small problem on Solaris, where the generated libtool
script failed with 'test: =: unary operator expected'.  I tracked it
down to some missing "" around the $pic_mode test argument.  The
following patch fixes this and several other similar lines.

diff -ur src-1.4.2/ltmain.in src-1.4.2-local/ltmain.in
--- src-1.4.2/ltmain.in Tue Sep 11 01:40:18 2001
+++ src-1.4.2-local/ltmain.in   Tue Jun  4 11:00:11 2002
@@ -467,7 +467,7 @@
       pic_mode=default
       ;;
     esac
-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
       # non-PIC code in shared libraries is not supported
       pic_mode=default
     fi
@@ -543,7 +543,7 @@
          $show "$mkdir $dir"
          $run $mkdir $dir
          status=$?
-         if test $status -ne 0 && test ! -d $dir; then
+         if test "$status" -ne 0 && test ! -d $dir; then
            exit $status
          fi
        fi
@@ -1307,7 +1307,7 @@
       $show "$mkdir $output_objdir"
       $run $mkdir $output_objdir
       status=$?
-      if test $status -ne 0 && test ! -d $output_objdir; then
+      if test "$status" -ne 0 && test ! -d $output_objdir; then
        exit $status
       fi
     fi
@@ -1366,7 +1366,7 @@
        ;;
     esac
     for pass in $passes; do
-      if test $linkmode = prog; then
+      if test "$linkmode" = prog; then
        # Determine which files to process
        case $pass in
        dlopen)
@@ -1383,11 +1383,11 @@
        found=no
        case $deplib in
        -l*)
-         if test $linkmode = oldlib && test $linkmode = obj; then
+         if test "$linkmode" = oldlib && test "$linkmode" = obj; then
            $echo "$modename: warning: \`-l' is ignored for archives/objects: 
$deplib" 1>&2
            continue
          fi
-         if test $pass = conv; then
+         if test "$pass" = conv; then
            deplibs="$deplib $deplibs"
            continue
          fi
@@ -1407,7 +1407,7 @@
              finalize_deplibs="$deplib $finalize_deplibs"
            else
              deplibs="$deplib $deplibs"
-             test $linkmode = lib && newdependency_libs="$deplib 
$newdependency_libs"
+             test "$linkmode" = lib && newdependency_libs="$deplib 
$newdependency_libs"
            fi
            continue
          fi
@@ -1416,16 +1416,16 @@
          case $linkmode in
          lib)
            deplibs="$deplib $deplibs"
-           test $pass = conv && continue
+           test "$pass" = conv && continue
            newdependency_libs="$deplib $newdependency_libs"
            newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed 
-e 's/^-L//'`
            ;;
          prog)
-           if test $pass = conv; then
+           if test "$pass" = conv; then
              deplibs="$deplib $deplibs"
              continue
            fi
-           if test $pass = scan; then
+           if test "$pass" = scan; then
              deplibs="$deplib $deplibs"
              newlib_search_path="$newlib_search_path "`$echo "X$deplib" | 
$Xsed -e 's/^-L//'`
            else
@@ -1440,7 +1440,7 @@
          continue
          ;; # -L
        -R*)
-         if test $pass = link; then
+         if test "$pass" = link; then
            dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
            # Make sure the xrpath contains only unique directories.
            case "$xrpath " in
@@ -1453,7 +1453,7 @@
          ;;
        *.la) lib="$deplib" ;;
        *.$libext)
-         if test $pass = conv; then
+         if test "$pass" = conv; then
            deplibs="$deplib $deplibs"
            continue
          fi
@@ -1474,7 +1474,7 @@
            continue
            ;;
          prog)
-           if test $pass != link; then
+           if test "$pass" != link; then
              deplibs="$deplib $deplibs"
            else
              compile_deplibs="$deplib $compile_deplibs"
@@ -1485,7 +1485,7 @@
          esac # linkmode
          ;; # *.$libext
        *.lo | *.$objext)
-         if test $pass = dlpreopen || test "$dlopen_support" != yes || test 
"$build_libtool_libs" = no; then
+         if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test 
"$build_libtool_libs" = no; then
            # If there is no dlopen support or we're linking statically,
            # we need to preload.
            newdlprefiles="$newdlprefiles $deplib"
@@ -1501,7 +1501,7 @@
          continue
          ;;
        esac # case $deplib
-       if test $found = yes || test -f "$lib"; then :
+       if test "$found" = yes || test -f "$lib"; then :
        else
          $echo "$modename: cannot find the library \`$lib'" 1>&2
          exit 1
@@ -1535,13 +1535,13 @@
 
        if test "$linkmode,$pass" = "lib,link" ||
           test "$linkmode,$pass" = "prog,scan" ||
-          { test $linkmode = oldlib && test $linkmode = obj; }; then
+          { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
           # Add dl[pre]opened files of deplib
          test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
          test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
        fi
 
-       if test $pass = conv; then
+       if test "$pass" = conv; then
          # Only check for convenience libraries
          deplibs="$lib $deplibs"
          if test -z "$libdir"; then
@@ -1560,7 +1560,7 @@
              esac
              tmp_libs="$tmp_libs $deplib"
            done
-         elif test $linkmode != prog && test $linkmode != lib; then
+         elif test "$linkmode" != prog && test "$linkmode" != lib; then
            $echo "$modename: \`$lib' is not a convenience library" 1>&2
            exit 1
          fi
@@ -1578,7 +1578,7 @@
        fi
 
        # This library was specified with -dlopen.
-       if test $pass = dlopen; then
+       if test "$pass" = dlopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 
1>&2
            exit 1
@@ -1627,7 +1627,7 @@
        name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
        # This library was specified with -dlpreopen.
-       if test $pass = dlpreopen; then
+       if test "$pass" = dlpreopen; then
          if test -z "$libdir"; then
            $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 
1>&2
            exit 1
@@ -1646,7 +1646,7 @@
 
        if test -z "$libdir"; then
          # Link the convenience library
-         if test $linkmode = lib; then
+         if test "$linkmode" = lib; then
            deplibs="$dir/$old_library $deplibs"
          elif test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$dir/$old_library $compile_deplibs"
@@ -1657,7 +1657,7 @@
          continue
        fi
 
-       if test $linkmode = prog && test $pass != link; then
+       if test "$linkmode" = prog && test "$pass" != link; then
          newlib_search_path="$newlib_search_path $ladir"
          deplibs="$lib $deplibs"
 
@@ -1673,7 +1673,7 @@
            -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | 
$Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
            esac
            # Need to link against all dependency_libs?
-           if test $linkalldeplibs = yes; then
+           if test "$linkalldeplibs" = yes; then
              deplibs="$deplib $deplibs"
            else
              # Need to hardcode shared library paths
@@ -1694,7 +1694,7 @@
          # Link against this shared library
 
          if test "$linkmode,$pass" = "prog,link" ||
-          { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
+          { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
            # Hardcode the library path.
            # Skip directories that are in the system default run-time
            # search path.
@@ -1716,7 +1716,7 @@
              esac
              ;;
            esac
-           if test $linkmode = prog; then
+           if test "$linkmode" = prog; then
              # We need to hardcode the library path
              if test -n "$shlibpath_var"; then
                # Make sure the rpath contains only unique directories.
@@ -1800,7 +1800,7 @@
            linklib=$newlib
          fi # test -n $old_archive_from_expsyms_cmds
 
-         if test $linkmode = prog || test "$mode" != relink; then
+         if test "$linkmode" = prog || test "$mode" != relink; then
            add_shlibpath=
            add_dir=
            add=
@@ -1849,7 +1849,7 @@
              *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
              esac
            fi
-           if test $linkmode = prog; then
+           if test "$linkmode" = prog; then
              test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
              test -n "$add" && compile_deplibs="$add $compile_deplibs"
            else
@@ -1866,7 +1866,7 @@
            fi
          fi
 
-         if test $linkmode = prog || test "$mode" = relink; then
+         if test "$linkmode" = prog || test "$mode" = relink; then
            add_shlibpath=
            add_dir=
            add=
@@ -1888,7 +1888,7 @@
              add="-l$name"
            fi
 
-           if test $linkmode = prog; then
+           if test "$linkmode" = prog; then
              test -n "$add_dir" && finalize_deplibs="$add_dir 
$finalize_deplibs"
              test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
            else
@@ -1896,7 +1896,7 @@
              test -n "$add" && deplibs="$add $deplibs"
            fi
          fi
-       elif test $linkmode = prog; then
+       elif test "$linkmode" = prog; then
          if test "$alldeplibs" = yes &&
             { test "$deplibs_check_method" = pass_all ||
               { test "$build_libtool_libs" = yes &&
@@ -1955,10 +1955,10 @@
          fi
        fi # link shared/static library?
 
-       if test $linkmode = lib; then
+       if test "$linkmode" = lib; then
          if test -n "$dependency_libs" &&
-            { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-              test $link_static = yes; }; then
+            { test "$hardcode_into_libs" != yes || test "$build_old_libs" = 
yes ||
+              test "$link_static" = yes; }; then
            # Extract -R from dependency_libs
            temp_deplibs=
            for libdir in $dependency_libs; do
@@ -1987,7 +1987,7 @@
            tmp_libs="$tmp_libs $deplib"
          done
 
-         if test $link_all_deplibs != no; then
+         if test "$link_all_deplibs" != no; then
            # Add the search paths of all dependency libraries
            for deplib in $dependency_libs; do
              case $deplib in
@@ -2030,15 +2030,15 @@
          fi # link_all_deplibs != no
        fi # linkmode = lib
       done # for deplib in $libs
-      if test $pass = dlpreopen; then
+      if test "$pass" = dlpreopen; then
        # Link the dlpreopened libraries before other libraries
        for deplib in $save_deplibs; do
          deplibs="$deplib $deplibs"
        done
       fi
-      if test $pass != dlopen; then
-       test $pass != scan && dependency_libs="$newdependency_libs"
-       if test $pass != conv; then
+      if test "$pass" != dlopen; then
+       test "$pass" != scan && dependency_libs="$newdependency_libs"
+       if test "$pass" != conv; then
          # Make sure lib_search_path contains only unique directories.
          lib_search_path=
          for dir in $newlib_search_path; do
@@ -2096,7 +2096,7 @@
        deplibs=
       fi
     done # for pass
-    if test $linkmode = prog; then
+    if test "$linkmode" = prog; then
       dlfiles="$newdlfiles"
       dlprefiles="$newdlprefiles"
     fi
@@ -2240,7 +2240,7 @@
          ;;
        esac
 
-       if test $age -gt $current; then
+       if test "$age" -gt $current; then
          $echo "$modename: AGE \`$age' is greater than the current interface 
number \`$current'" 1>&2
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
          exit 1
@@ -2279,7 +2279,7 @@
 
          # Add in all the interfaces that we are compatible with.
          loop=$revision
-         while test $loop != 0; do
+         while test "$loop" != 0; do
            iface=`expr $revision - $loop`
            loop=`expr $loop - 1`
            verstring="sgi$major.$iface:$verstring"
@@ -2302,7 +2302,7 @@
 
          # Add in all the interfaces that we are compatible with.
          loop=$age
-         while test $loop != 0; do
+         while test "$loop" != 0; do
            iface=`expr $current - $loop`
            loop=`expr $loop - 1`
            verstring="$verstring:${iface}.0"
@@ -2403,7 +2403,7 @@
          *) finalize_rpath="$finalize_rpath $libdir" ;;
          esac
        done
-       if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
+       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; 
then
          dependency_libs="$temp_xrpath $dependency_libs"
        fi
       fi
@@ -2446,7 +2446,7 @@
            ;;
          *)
            # Add libc to deplibs on all other systems if necessary.
-           if test $build_libtool_need_lc = "yes"; then
+           if test "$build_libtool_need_lc" = "yes"; then
              deplibs="$deplibs -lc"
            fi
            ;;
@@ -2692,7 +2692,7 @@
            echo "*** automatically added whenever a program is linked with 
this library"
            echo "*** or is declared to -dlopen it."
 
-           if test $allow_undefined = no; then
+           if test "$allow_undefined" = no; then
              echo
              echo "*** Since this library must not contain undefined symbols,"
              echo "*** because either the platform does not support them or"
@@ -2719,7 +2719,7 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
-       if test $hardcode_into_libs = yes; then
+       if test "$hardcode_into_libs" = yes; then
          # Hardcode the library paths
          hardcode_libdirs=
          dep_rpath=
@@ -2850,7 +2850,7 @@
            $show "mkdir $gentop"
            $run mkdir "$gentop"
            status=$?
-           if test $status -ne 0 && test ! -d "$gentop"; then
+           if test "$status" -ne 0 && test ! -d "$gentop"; then
              exit $status
            fi
            generated="$generated $gentop"
@@ -2869,7 +2869,7 @@
              $show "mkdir $xdir"
              $run mkdir "$xdir"
              status=$?
-             if test $status -ne 0 && test ! -d "$xdir"; then
+             if test "$status" -ne 0 && test ! -d "$xdir"; then
                exit $status
              fi
              $show "(cd $xdir && $AR x $xabs)"
@@ -2989,7 +2989,7 @@
          $show "mkdir $gentop"
          $run mkdir "$gentop"
          status=$?
-         if test $status -ne 0 && test ! -d "$gentop"; then
+         if test "$status" -ne 0 && test ! -d "$gentop"; then
            exit $status
          fi
          generated="$generated $gentop"
@@ -3008,7 +3008,7 @@
            $show "mkdir $xdir"
            $run mkdir "$xdir"
            status=$?
-           if test $status -ne 0 && test ! -d "$xdir"; then
+           if test "$status" -ne 0 && test ! -d "$xdir"; then
              exit $status
            fi
            $show "(cd $xdir && $AR x $xabs)"
@@ -3403,7 +3403,7 @@
        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% 
@address@hidden"`
       fi
 
-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
        # Replace the output file specification.
        compile_command=`$echo "X$compile_command" | $Xsed -e 
'address@hidden@%'"$output"'%g'`
        link_command="$compile_command$compile_rpath"
@@ -3771,7 +3771,7 @@
        $show "mkdir $gentop"
        $run mkdir "$gentop"
        status=$?
-       if test $status -ne 0 && test ! -d "$gentop"; then
+       if test "$status" -ne 0 && test ! -d "$gentop"; then
          exit $status
        fi
        generated="$generated $gentop"
@@ -3791,7 +3791,7 @@
          $show "mkdir $xdir"
          $run mkdir "$xdir"
          status=$?
-         if test $status -ne 0 && test ! -d "$xdir"; then
+         if test "$status" -ne 0 && test ! -d "$xdir"; then
            exit $status
          fi
          $show "(cd $xdir && $AR x $xabs)"
@@ -3948,7 +3948,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-         if test "$installed" = no && test $need_relink = yes; then
+         if test "$installed" = no && test "$need_relink" = yes; then
            $echo >> $output "\
 relink_command=\"$relink_command\""
          fi
@@ -4660,10 +4660,10 @@
        objdir="$dir/$objdir"
       fi
       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test $mode = uninstall && objdir="$dir"
+      test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
-      if test $mode = clean; then
+      if test "$mode" = clean; then
        case " $rmdirs " in
          *" $objdir "*) ;;
          *) rmdirs="$rmdirs $objdir" ;;
@@ -4695,9 +4695,9 @@
            rmfiles="$rmfiles $objdir/$n"
          done
          test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-         test $mode = clean && rmfiles="$rmfiles $objdir/$name 
$objdir/${name}i"
+         test "$mode" = clean && rmfiles="$rmfiles $objdir/$name 
$objdir/${name}i"
 
-         if test $mode = uninstall; then
+         if test "$mode" = uninstall; then
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
              eval cmds=\"$postuninstall_cmds\"
@@ -4741,7 +4741,7 @@
 
       *)
        # Do a test to see if this is a libtool program.
-       if test $mode = clean &&
+       if test "$mode" = clean &&
           (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 
2>&1; then
          relink_command=
          . $dir/$file





reply via email to

[Prev in Thread] Current Thread [Next in Thread]