Fix the Linux shared build.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/203076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26291 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 77 insertions, 20 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5553684..5a7081e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2279,12 +2279,12 @@
             'browser/views/autocomplete/autocomplete_popup_gtk.h'
           ],
         }],
-	['OS=="freebsd"', {
-	  'dependencies': [
+        ['OS=="freebsd"', {
+          'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
-	  ],
-	}],
+          ],
+        }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
@@ -2947,6 +2947,7 @@
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
+            '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
         # Windows-specific rules.
@@ -4018,7 +4019,7 @@
         'browser/chromeos/chromeos_version_loader_unittest.cc',
         'browser/chromeos/pipe_reader_unittest.cc',
         'browser/chromeos/external_cookie_handler_unittest.cc',
-	'browser/chromeos/gview_request_interceptor_unittest.cc',
+        'browser/chromeos/gview_request_interceptor_unittest.cc',
         # It is safe to list */cocoa/* files in the "common" file list
         # without an explicit exclusion since gyp is smart enough to
         # exclude them from non-Mac builds.
@@ -4286,7 +4287,7 @@
             # on linux, though.
             'browser/download/download_manager_unittest.cc',
             'browser/views/bookmark_context_menu_test.cc',
-	    'browser/gtk/options/cookies_view_unittest.cc',
+            'browser/gtk/options/cookies_view_unittest.cc',
             # Compact Language Detection (cld) is not supported in linux yet.
             '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
@@ -4305,9 +4306,9 @@
              ['exclude', 'browser/gtk/bookmark_editor_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/go_button_gtk_unittest\\.cc$'],
              ['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
-	     ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'],
-	     ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$'],
-	     ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'],
+             ['exclude', 'browser/gtk/options/cookies_view_unittest\\.cc$'],
+             ['exclude', 'browser/gtk/options/languages_page_gtk_unittest\\.cc$'],
+             ['exclude', 'browser/gtk/gtk_theme_provider_unittest\\.cc$'],
           ],
         }],
         ['OS=="mac"', {
@@ -5415,9 +5416,9 @@
                 'app/keystone_glue.h',
                 'app/keystone_glue.m',
               ],
-	      'sources!': [
-	        '<@(browser_tests_sources_exclude_on_mac)',
-       	      ],
+              'sources!': [
+                '<@(browser_tests_sources_exclude_on_mac)',
+                     ],
               # TODO(mark): We really want this for all non-static library targets,
               # but when we tried to pull it up to the common.gypi level, it broke
               # other things like the ui, startup, and page_cycler tests. *shrug*
@@ -5659,7 +5660,7 @@
         },
         {
           'target_name': 'interactive_ui_tests_dll',
-	  # 'product_name': 'interactive_ui_tests',
+          # 'product_name': 'interactive_ui_tests',
           'type': 'shared_library',
           'msvs_guid': '04116FAF-DA17-46EE-B108-971FCF0F0AFC',
           'dependencies': [
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index fdc65e4..d53fb90 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -94,6 +94,17 @@
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
       ],
+      'conditions': [
+        [ 'OS == "linux" or OS == "freebsd"', {
+          'dependencies': [
+            # Workaround for gyp bug 69.
+            # Needed to handle the #include chain:
+            #   base/test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
     },
    {
       'target_name': 'courgette_fuzz',
@@ -107,6 +118,17 @@
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
       ],
+      'conditions': [
+        [ 'OS == "linux" or OS == "freebsd"', {
+          'dependencies': [
+            # Workaround for gyp bug 69.
+            # Needed to handle the #include chain:
+            #   base/test_suite.h
+            #   gtk/gtk.h
+            '../build/linux/system.gyp:gtk',
+          ],
+        }],
+      ],
     },
   ],
 }
diff --git a/printing/printing.gyp b/printing/printing.gyp
index c6340ec..d1a7d85 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -68,6 +68,12 @@
           }, {  # else: OS=="win"
             'sources/': [['exclude', '_posix\\.cc$']]
         }],
+        ['OS=="linux"', {
+          'dependencies': [
+            # For FT_Init_FreeType and friends.
+            '../build/linux/system.gyp:freetype2',
+          ],
+        }],
       ],
     },
     {
@@ -101,7 +107,6 @@
         ],
         ['OS=="linux"', {
             'dependencies': [
-              '../build/linux/system.gyp:fontconfig',
               '../build/linux/system.gyp:gtk',
            ],
         }],
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 623aa06..f118075 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -148,6 +148,12 @@
                 '../..',  # The chromium 'src' directory.
               ],
             },
+            'link_settings': {
+              'libraries': [
+                # We need dl for dlopen() and friends.
+                '-ldl',
+              ],
+            },
             'actions': [
               {
                 'action_name': 'generate_stubs',
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index fc95efb..352fb32 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -37,8 +37,18 @@
         # libevent has platform-specific implementation files.  Since its
         # native build uses autoconf, platform-specific config.h files are
         # provided and live in platform-specific directories.
-        [ 'OS == "linux"', { 'sources': [ 'epoll.c', 'epoll_sub.c' ],
-                             'include_dirs': [ 'linux' ] } ],
+        [ 'OS == "linux"', {
+          'sources': [ 'epoll.c', 'epoll_sub.c' ],
+          'include_dirs': [ 'linux' ],
+          'link_settings':
+            { 'libraries': [
+              # We need rt for clock_gettime().
+              # TODO(port) Maybe on FreeBSD as well?
+              '-lrt',
+              ],
+            },
+          }
+        ],
         [ 'OS == "mac" or OS == "freebsd"',   { 'sources': [ 'kqueue.c' ],
                              'include_dirs': [ 'mac' ] } ],
       ],
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index f785fd7..ed16e58 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -174,6 +174,14 @@
             ],
           },
           'conditions': [
+            ['OS=="linux"', {
+              'link_settings': {
+                'libraries': [
+                  # We need dl for dlopen() and friends.
+                  '-ldl',
+                ],
+              },
+            }],
             ['OS=="mac"', {'defines': ['_REENTRANT']}],
             ['OS=="win"', {
               'product_name': 'libxml2',
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 9297345..cd1af20 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -24,6 +24,13 @@
     {
       'target_name': 'sqlite',
       'conditions': [
+        ['OS=="linux" and not use_system_sqlite', {
+          'link_settings': {
+            'libraries': [
+              '-ldl',
+            ],
+          },
+        }],
         ['OS=="linux" and use_system_sqlite', {
           'type': 'settings',
           'direct_dependent_settings': {
@@ -224,9 +231,6 @@
           ],
           'link_settings': {
             'link_languages': ['c++'],
-            'libraries': [
-              '-ldl',
-            ],
           },
         },
       ],
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index a7e1c4f..d149f8f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1094,8 +1094,9 @@
       'conditions': [
         ['OS=="linux" or OS=="freebsd"', {
           'dependencies': [
-            '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:gtk',
+            '../build/linux/system.gyp:x11',
           ],
           'include_dirs': [
             'api/public/x11',