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

[T.C. Hollingsworth]

commit dc4107c9b79744c6aa45a0a1b9da3a4af5409c81
Merge: f08c741 62db431
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Mar 18 15:50:08 2014 -0700

    Merge branch 'master' into el6

 v8.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc v8.spec
index 2ede037,963e9dc..b4e90a7
--- a/v8.spec
+++ b/v8.spec
@@@ -75,9 -75,10 +75,10 @@@ Development headers and libraries for v
  %patch3 -p1
  %patch4 -p1
  %patch5 -p1
+ %patch6 -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