Instrumented libraries: introduce release-specific patches.

third_party/instrumented_libraries/instrumented_libraries.gyp

Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 1d09cb7fb2f65f014ac4c3723f3334682f651693..1a437bdd2cc04d0f9ce5372e8dfab3ea719e0cd1 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -8,6 +8,8 @@
     'instrumented_libraries_jobs%': 1,
   },
 
+  'ubuntu_release': '<!(lsb_release -cs)',
+
   'conditions': [
     ['asan==1', {
       'sanitizer_type': 'asan',
@@ -219,7 +221,13 @@
         # From debian/rules.
         '--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts',
       ],
-      'patch': 'patches/libfontconfig.diff',
+      'conditions': [
+        ['"<(_ubuntu_release)"=="precise"', {

[Alexander Potapenko, 2014/10/01 08:55:49]

Can you please reduce it to:

  'patch': 'patches/libfontconfig.<(_ubuntu_release).diff'

, so that we fail in the case of unsupported Ubuntu version?
Also, why 'ubuntu_release' is prefixed with underscore?

[earthdok, 2014/10/01 13:20:00]

That's exactly what I tried to avoid. If the most recent patch still applies in
some future Ubuntu release (which is rather common), we should just use it. No
need to keep copies of the same patch with different names for each release.
It's an automatic variable.
https://code.google.com/p/gyp/wiki/InputFormatReference#Variables

+          'patch': 'patches/libfontconfig.precise.diff',
+        }, {
+          'patch': 'patches/libfontconfig.trusty.diff',
+        }],
+      ],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -505,7 +513,13 @@
           '--with-xinput=yes',
       ],
       'dependencies=': [],
-      'patch': 'patches/libgtk2.0-0.diff',
+      'conditions': [
+        ['"<(_ubuntu_release)"=="precise"', {

[Alexander Potapenko, 2014/10/01 08:55:49]

ditto.

+          'patch': 'patches/libgtk2.0-0.precise.diff',
+        }, {
+          'patch': 'patches/libgtk2.0-0.trusty.diff',
+        }],
+      ],
       'run_before_build': 'scripts/libgtk2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },