From f6422553a95c2548f4eda8eb56cef5c6fa1cb55b Mon Sep 17 00:00:00 2001
From: "evan@chromium.org"
 <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 24 Aug 2009 21:16:14 +0000
Subject: linux: call g_thread_init() at relevant startup points

According to glib docs, we need to do this if it's at all possible
for us to hit glib on multiple threads.  This may be happening
when we grab plugin metadata from the file thread.

Rather than explicitly depending on gthread all over the place,
just put it in with the GTK dep (since anywhere we're using GTK
we ought to init gthread).

(Note that this is *not* initializing the GDK locking system.)

BUG=18957

Review URL: http://codereview.chromium.org/174264

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24148 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/linux/system.gyp | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'build/linux')

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 68b52be..e10c905 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -9,15 +9,15 @@
       'type': 'settings',
       'direct_dependent_settings': {
         'cflags': [
-          '<!@(pkg-config --cflags gtk+-2.0)',
+          '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
         ],
       },
       'link_settings': {
         'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)',
+          '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
         ],
         'libraries': [
-          '<!@(pkg-config --libs-only-l gtk+-2.0)',
+          '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
         ],
       },
     },
@@ -107,23 +107,6 @@
       },
     },
     {
-      'target_name': 'gthread',
-      'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(pkg-config --cflags gthread-2.0)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)',
-        ],
-        'libraries': [
-          '<!@(pkg-config --libs-only-l gthread-2.0)',
-        ],
-      },
-    },
-    {
       'target_name': 'x11',
       'type': 'settings',
       'direct_dependent_settings': {
-- 
cgit v1.1