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