components/openexr/patches/000-ltmain.patch
changeset 147 5af6875cbf70
child 7697 8a41b565423d
equal deleted inserted replaced
146:8e22ba234817 147:5af6875cbf70
       
     1 *** ltmain.sh	Fri Jun 27 18:23:52 2008
       
     2 --- ltmain.sh	Fri Jun 27 18:12:07 2008
       
     3 ***************
       
     4 *** 1382,1388 ****
       
     5         # but this is not reliable with gcc because gcc may use -mfoo to
       
     6         # select a different linker, different libraries, etc, while
       
     7         # -Wl,-mfoo simply passes -mfoo to the linker.
       
     8 !       -m*)
       
     9   	# Unknown arguments in both finalize_command and compile_command need
       
    10   	# to be aesthetically quoted because they are evaled later.
       
    11   	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       
    12 --- 1382,1388 ----
       
    13         # but this is not reliable with gcc because gcc may use -mfoo to
       
    14         # select a different linker, different libraries, etc, while
       
    15         # -Wl,-mfoo simply passes -mfoo to the linker.
       
    16 !       -m*|-xarch=*)
       
    17   	# Unknown arguments in both finalize_command and compile_command need
       
    18   	# to be aesthetically quoted because they are evaled later.
       
    19   	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       
    20 ***************
       
    21 *** 1393,1401 ****
       
    22   	esac
       
    23           compile_command="$compile_command $arg"
       
    24           finalize_command="$finalize_command $arg"
       
    25 !         if test "$with_gcc" = "yes" ; then
       
    26             compiler_flags="$compiler_flags $arg"
       
    27 !         fi
       
    28           continue
       
    29           ;;
       
    30   
       
    31 --- 1393,1402 ----
       
    32   	esac
       
    33           compile_command="$compile_command $arg"
       
    34           finalize_command="$finalize_command $arg"
       
    35 !         # comment out this to support 64bit for CC
       
    36 !         #if test "$with_gcc" = "yes" ; then
       
    37             compiler_flags="$compiler_flags $arg"
       
    38 !         #fi
       
    39           continue
       
    40           ;;
       
    41   
       
    42 ***************
       
    43 *** 3890,3896 ****
       
    44   	save_ifs="$IFS"; IFS='~'
       
    45   	for cmd in $cmds; do
       
    46   	  IFS="$save_ifs"
       
    47 ! 	  eval cmd=\"$cmd\"
       
    48   	  $show "$cmd"
       
    49   	  $run eval "$cmd" || exit $?
       
    50   	done
       
    51 --- 3891,3898 ----
       
    52   	save_ifs="$IFS"; IFS='~'
       
    53   	for cmd in $cmds; do
       
    54   	  IFS="$save_ifs"
       
    55 ! 	  # Append the cmd to remove runpath for CC"
       
    56 ! 	  eval cmd=\"$cmd -norunpath\"
       
    57   	  $show "$cmd"
       
    58   	  $run eval "$cmd" || exit $?
       
    59   	done
       
    60 ***************
       
    61 *** 4512,4518 ****
       
    62   	$echo "$modename: \`$output' will be relinked during installation" 1>&2
       
    63         else
       
    64   	if test "$fast_install" != no; then
       
    65 ! 	  link_command="$finalize_var$compile_command$finalize_rpath"
       
    66   	  if test "$fast_install" = yes; then
       
    67   	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
       
    68   	  else
       
    69 --- 4514,4520 ----
       
    70   	$echo "$modename: \`$output' will be relinked during installation" 1>&2
       
    71         else
       
    72   	if test "$fast_install" != no; then
       
    73 ! 	  link_command="$finalize_var$compile_command -norunpath"
       
    74   	  if test "$fast_install" = yes; then
       
    75   	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
       
    76   	  else