Changeset 143039 in webkit


Ignore:
Timestamp:
Feb 15, 2013 1:05:33 PM (11 years ago)
Author:
Martin Robinson
Message:

Unreviewed, rolling out parts of r142731.
​http://trac.webkit.org/changeset/142731
​https://bugs.webkit.org/show_bug.cgi?id=109672

This patch broke the GTK+ gyp build. Roll out the changes there,
since they were actually unnecessary.

  • gyp/Configuration.gypi.in:
  • gyp/Dependencies.gyp:
  • gyp/JavaScriptCore.gyp:
  • gyp/WTF.gyp:
Location:
trunk/Source/WebKit/gtk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/gtk/ChangeLog

    r142755 r143039  
     12013-02-15  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Unreviewed, rolling out parts of r142731.
     4        http://trac.webkit.org/changeset/142731
     5        https://bugs.webkit.org/show_bug.cgi?id=109672
     6
     7        This patch broke the GTK+ gyp build. Roll out the changes there,
     8        since they were actually unnecessary.
     9
     10        * gyp/Configuration.gypi.in:
     11        * gyp/Dependencies.gyp:
     12        * gyp/JavaScriptCore.gyp:
     13        * gyp/WTF.gyp:
     14
    1152013-02-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    216

  • trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in

    r142731 r143039  
    3232    'UNICODE_CFLAGS': '@UNICODE_CFLAGS@',
    3333    'UNICODE_LIBS': '@UNICODE_LIBS@',
     34    'GLIB_CFLAGS': '@GLIB_CFLAGS@',
     35    'GLIB_LIBS': '@GLIB_LIBS@',
    3436  }
    3537}

  • trunk/Source/WebKit/gtk/gyp/Dependencies.gyp

    r142731 r143039  
    11{
    22  'targets': [
     3    {
     4      'target_name': 'glib',
     5      'type': 'none',
     6      'direct_dependent_settings': {
     7        'cflags': [ '<@(GLIB_CFLAGS)' ],
     8        'link_settings': {
     9          'libraries' : [ '<@(GLIB_LIBS)' ],
     10        },
     11      },
     12    },
    313    {
    414      'target_name': 'icu',

  • trunk/Source/WebKit/gtk/gyp/JavaScriptCore.gyp

    r142731 r143039  
    7070          'WTF.gyp:wtf',
    7171          'LLIntOffsetExtractor',
     72          'Dependencies.gyp:glib',
    7273          'Dependencies.gyp:icu',
    7374        ],

  • trunk/Source/WebKit/gtk/gyp/WTF.gyp

    r142731 r143039  
    1212      'type': 'static_library',
    1313      'dependencies': [
     14        'Dependencies.gyp:glib',
    1415        'Dependencies.gyp:icu',
    1516       ],
Note: See TracChangeset for help on using the changeset viewer.