diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 23:31:55 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 23:31:55 +0000 |
| commit | c24e5d031e408a81cd6a004353b4d3065d29046d (patch) | |
| tree | c9bd374cca48525c6ca6dfc632ffec298336089b | |
| parent | 77e802a962b6e3104a43fb8b9c289584f408901e (diff) | |
| download | chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.zip chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.tar.gz chromium_src-c24e5d031e408a81cd6a004353b4d3065d29046d.tar.bz2 | |
Fix linking with gold by cleaning up lib dependencies.
- Remove pangoft2, we don't use it anywhere.
- Add gdk, fontconfig and freetype2 as dependencies of skia. Gdk is
used in platform_canvas_linux.
- X11, Xrender and Xext are used by the IPC system, so everything that
depends on common, needs to link in those libs. By moving the
link_settings line into the libcommon.a target, all projects
inherit these.
Review URL: http://codereview.chromium.org/60070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13055 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/linux/system.gyp | 34 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 14 | ||||
| -rw-r--r-- | skia/skia.gyp | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
4 files changed, 41 insertions, 12 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 73f439a..0c6b7ed 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -33,16 +33,44 @@ }, }, { - 'target_name': 'pangoft2', + 'target_name': 'freetype2', 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(python pkg_config_wrapper.py --cflags pangoft2)', + '<!@(python pkg_config_wrapper.py --cflags freetype2)', ], }, 'link_settings': { 'libraries': [ - '<!@(python pkg_config_wrapper.py --libs pangoft2)', + '<!@(python pkg_config_wrapper.py --libs freetype2)', + ], + }, + }, + { + 'target_name': 'fontconfig', + 'type': 'settings', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(python pkg_config_wrapper.py --cflags fontconfig)', + ], + }, + 'link_settings': { + 'libraries': [ + '<!@(python pkg_config_wrapper.py --libs fontconfig)', + ], + }, + }, + { + 'target_name': 'gdk', + 'type': 'settings', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(python pkg_config_wrapper.py --cflags gdk-2.0)', + ], + }, + 'link_settings': { + 'libraries': [ + '<!@(python pkg_config_wrapper.py --libs gdk-2.0)', ], }, }, diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4e3df4d..199a69d3 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -314,6 +314,13 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', ], + 'link_settings': { + 'libraries': [ + '-lX11', + '-lXrender', + '-lXext', + ], + }, }, { # else: 'OS!="linux"' 'sources!': [ 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', @@ -1537,13 +1544,6 @@ # Needed for chrome_dll_main.cc #include of gtk/gtk.h '../build/linux/system.gyp:gtk', ], - 'link_settings': { - 'libraries': [ - '-lX11', - '-lXrender', - '-lXext', - ], - }, 'copies': [ { 'destination': '<(PRODUCT_DIR)', diff --git a/skia/skia.gyp b/skia/skia.gyp index ae3ccd7..bdf2de1 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -688,7 +688,9 @@ }], [ 'OS == "linux"', { 'dependencies': [ - '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:gdk', + '../build/linux/system.gyp:fontconfig', + '../build/linux/system.gyp:freetype2', ], 'cflags': [ '-Wno-unused', diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index e1ec117..d65dff2 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4446,7 +4446,6 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:pangoft2', ], 'sources!': [ 'glue/plugins/plugin_stubs.cc', |