Fix/unfuzz patches for new upstream version

ept · Sep 16, 2011 · 0c24706 · 0c24706
1 parent 92bb330
commit 0c24706
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/debian/patches/0002-armel-build.patch b/debian/patches/0002-armel-build.patch
@@ -11,19 +11,17 @@ Bug-GCC: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42748
 Last-Update: 2010-11-25
 --- a/SConstruct
 +++ b/SConstruct
-@@ -212,7 +212,8 @@
-       },
-       'unalignedaccesses:off' : {
-         'CPPDEFINES' : ['CAN_USE_UNALIGNED_ACCESSES=0']
--      }
-+      },
-+      'CCFLAGS':      ['-Wno-psabi', '-fno-tree-sink']
+@@ -140,6 +140,7 @@
      },
-     'simulator:arm': {
-       'CCFLAGS':      ['-m32'],
+     'arch:arm': {
+       'CPPDEFINES':   ['V8_TARGET_ARCH_ARM'],
++      'CCFLAGS':      ['-Wno-psabi', '-fno-tree-sink'],
+       'unalignedaccesses:on' : {
+         'CPPDEFINES' : ['CAN_USE_UNALIGNED_ACCESSES=1']
+       },
 --- a/src/arm/macro-assembler-arm.cc
 +++ b/src/arm/macro-assembler-arm.cc
-@@ -57,9 +57,6 @@
+@@ -60,9 +60,6 @@
  // We do not support thumb inter-working with an arm architecture not supporting
  // the blx instruction (below v5t).  If you know what CPU you are compiling for
  // you can use -march=armv7 or similar.

diff --git a/debian/patches/0003-add-the-install-target.patch b/debian/patches/0003-add-the-install-target.patch
@@ -6,17 +6,17 @@ Last-Update: 2011-04-13
 
 --- a/SConstruct
 +++ b/SConstruct
-@@ -818,6 +818,7 @@
+@@ -1130,6 +1130,7 @@
    result.Add('mode', 'compilation mode (debug, release)', 'release')
    result.Add('sample', 'build sample (shell, process, lineprocessor)', '')
    result.Add('cache', 'directory to use for scons build cache', '')
 +  result.Add('install', 'install result files', '')
    result.Add('env', 'override environment settings (NAME0:value0,NAME1:value1,...)', '')
    result.Add('importenv', 'import environment settings (NAME0,NAME1,...)', '')
-   for (name, option) in SIMPLE_OPTIONS.iteritems():
-@@ -1171,8 +1172,26 @@
-   env.Alias('sample', samples)
+   AddOptions(PLATFORM_OPTIONS, result)
+@@ -1530,8 +1531,26 @@
    env.Alias('d8', d8s)
+   env.Alias('preparser', preparsers)
 
 +  install_dirs = []
 +  destdir = ARGUMENTS.get('DESTDIR', '')

diff --git a/debian/patches/0004-gcc-opt-level-2.patch b/debian/patches/0004-gcc-opt-level-2.patch
@@ -4,12 +4,12 @@ Author: Jérémy Lal <kapouer@melix.org>
 Last-Update: 2011-02-16
 --- a/SConstruct
 +++ b/SConstruct
-@@ -150,7 +150,7 @@
-       }
+@@ -94,7 +94,7 @@ LIBRARY_FLAGS = {
+       'CPPDEFINES':   ['ENABLE_DISASSEMBLER', 'DEBUG'],
      },
      'mode:release': {
 -      'CCFLAGS':      ['-O3', '-fomit-frame-pointer', '-fdata-sections',
 +      'CCFLAGS':      ['-O2', '-fomit-frame-pointer', '-fdata-sections',
                         '-ffunction-sections'],
-       'os:android': {
-         'CCFLAGS':    ['-mthumb', '-Os'],
+     },
+     'os:linux': {
diff --git a/debian/patches/0005-enable-i18n-extension.patch b/debian/patches/0005-enable-i18n-extension.patch
@@ -4,17 +4,17 @@ Author: Giuseppe Iuculano <iuculano@debian.org>
 Last-Update: 2011-06-19
 --- a/src/SConscript
 +++ b/src/SConscript
-@@ -135,6 +135,7 @@
+@@ -136,6 +136,7 @@
      zone.cc
      extensions/gc-extension.cc
      extensions/externalize-string-extension.cc
 +    extensions/experimental/i18n-extension.cc
      """),
    'arch:arm': Split("""
-     jump-target-light.cc
+     arm/builtins-arm.cc
 --- a/SConstruct
 +++ b/SConstruct
-@@ -161,7 +161,7 @@
+@@ -101,7 +101,7 @@
        'CCFLAGS':      ['-ansi'] + GCC_EXTRA_CCFLAGS,
        'library:shared': {
          'CPPDEFINES': ['V8_SHARED'],
@@ -23,7 +23,7 @@ Last-Update: 2011-06-19
        }
      },
      'os:macos': {
-@@ -353,7 +353,7 @@
+@@ -347,7 +347,7 @@
  MKSNAPSHOT_EXTRA_FLAGS = {
    'gcc': {
      'os:linux': {
@@ -32,16 +32,16 @@ Last-Update: 2011-06-19
      },
      'os:macos': {
        'LIBS': ['pthread'],
-@@ -469,7 +469,7 @@
-       'CCFLAGS': ['-fno-rtti', '-fno-exceptions']
+@@ -464,7 +464,7 @@
+       'LINKFLAGS':    ['$CCFLAGS'],
      },
      'os:linux': {
 -      'LIBS':         ['pthread'],
 +      'LIBS':         ['pthread', 'icui18n', 'icuuc', 'icudata'],
      },
      'os:macos': {
        'LIBS':         ['pthread'],
-@@ -1181,7 +1181,7 @@
+@@ -1540,7 +1540,7 @@
      env.Install(libdir, lib[0])
      if dir not in install_dirs:
        install_dirs += libdir