Clean up dependencies on X11 libraries

build/linux/system.gyp

Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e785b8ef5731c9f9920e975c6eab88288c63fa86..94163fc21fd4d96ad0bae68f8437a4e0a399943a 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -296,6 +296,9 @@
       'target_name': 'glib',
       'type': 'none',
       'toolsets': ['host', 'target'],
+      'dependencies': [

[Paweł Hajdan Jr., 2014/02/07 23:09:28]

In theory this shouldn't be needed. pkg-config files for glib should handle that
if this is really a dependency of glib.

Up to you, but if you'd like to take a closer look maybe try removing it and see
what happens. If some target fails to compile now, it may be better to add an
explicit dependency on libXtst to that target.

+        'xtst'
+      ],
       'variables': {
         'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0',
       },
@@ -329,11 +332,6 @@
             ],
           },
         }],
-        ['use_x11==1', {
-          'link_settings': {
-            'libraries': [ '-lXtst' ]
-          }
-        }],
       ],
     },
     {
@@ -952,21 +950,57 @@
       },
     },
     {
-      'target_name': 'xtst',
+      'target_name': 'xscrnsaver',
       'type': 'none',
       'direct_dependent_settings': {
         'cflags': [
-          '<!@(<(pkg-config) --cflags xtst)',
+          '<!@(<(pkg-config) --cflags xscrnsaver)',
         ],
       },
       'link_settings': {
         'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
+          '<!@(<(pkg-config) --libs-only-L --libs-only-other xscrnsaver)',
         ],
         'libraries': [
-          '<!@(<(pkg-config) --libs-only-l xtst)',
+          '<!@(<(pkg-config) --libs-only-l xscrnsaver)',
         ],
       },
+    },
+    {
+      'target_name': 'xtst',
+      'type': 'none',
+      'toolsets': ['host', 'target'],
+      'conditions': [
+        ['_toolset=="target"', {

[Paweł Hajdan Jr., 2014/02/07 23:09:28]

This seems to be doing exactly the same thing in both branches. Is this
expected? Maybe the idea is to have these expand to something different in both
cases, but it looks a bit suspicious.

[piman, 2014/02/07 23:33:28]

It's not... <(pkg-config) vs pkg-config (target pkg-config that uses the sysroot
vs host pkg-config, that doesn't)

+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags xtst)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l xtst)',
+            ],
+          },
+        }, {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags xtst)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other xtst)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l xtst)',
+            ],
+          },
+        }]
+      ]
     }
   ],
 }