components/ilmbase/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 7696 3d9ec1a1fe4e
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
*** ilmbase-1.0.1/ltmain.sh.org	Thu Jun 26 19:20:21 2008
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     2
--- ltmain.sh	Thu Jun 26 19:18:49 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
*** 1553,1561 ****
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
  	esac
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
          compile_command="$compile_command $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     7
          finalize_command="$finalize_command $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
!         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
     9
            compiler_flags="$compiler_flags $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
!         fi
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
          continue
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
          ;;
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
  
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
--- 1553,1562 ----
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
  	esac
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
          compile_command="$compile_command $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
          finalize_command="$finalize_command $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
!         # 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
    19
!         #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
    20
            compiler_flags="$compiler_flags $arg"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
!         #fi
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
          continue
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
          ;;
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
  
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
***************
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
*** 4015,4021 ****
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    27
  	save_ifs="$IFS"; IFS='~'
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
  	for cmd in $cmds; do
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
  	  IFS="$save_ifs"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
! 	  eval cmd=\"$cmd\"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
  	  $show "$cmd"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
  	  $run eval "$cmd" || exit $?
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
  	done
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
--- 4016,4023 ----
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
  	save_ifs="$IFS"; IFS='~'
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    36
  	for cmd in $cmds; do
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
  	  IFS="$save_ifs"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
!           # Append the command to remove runpath for CC.
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
! 	  eval cmd=\"$cmd -norunpath\"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
  	  $show "$cmd"
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
  	  $run eval "$cmd" || exit $?
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
  	done