[v8/el6: 3/3] Merge branch 'master' into el6

[T.C. Hollingsworth]

commit f9bedbd65129965b0dcd7965df6f6b35900854f7
Merge: a30218e 3d7deed
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Feb 26 22:38:37 2014 -0700

    Merge branch 'master' into el6

 v8-3.14.5.10-CVE-2013-6650.patch |   80 ++++++++++++++++++++++++++++++++++++++
 v8.spec                          |   13 ++++++-
 2 files changed, 92 insertions(+), 1 deletions(-)
---
diff --cc v8.spec
index 6042aee,e85be91..6257979
--- a/v8.spec
+++ b/v8.spec
@@@ -66,9 -70,10 +70,10 @@@ Development headers and libraries for v
  %patch2 -p1
  %patch3 -p1
  %patch4 -p1
+ %patch5 -p1
  
  # -fno-strict-aliasing is needed with gcc 4.4 to get past some ugly code
 -PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -Wno-unused-parameter -Wno-error=strict-overflow -Wno-error=unused-local-typedefs -Wno-unused-but-set-variable\'| sed "s/ /',/g" | sed "s/',/', '/g"`
 +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -Wno-unused-parameter -Wno-error=strict-overflow -Wno-unused-but-set-variable\'| sed "s/ /',/g" | sed "s/',/', '/g"`
  sed -i "s|'-O3',|$PARSED_OPT_FLAGS,|g" SConstruct
  
  # clear spurious executable bits