Instrumented libraries: introduce release-specific patches.

third_party/instrumented_libraries/instrumented_libraries.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'verbose_libraries_build%': 0,
     'instrumented_libraries_jobs%': 1,
   },
 
+  'ubuntu_release': '<!(lsb_release -cs)',
+
   'conditions': [
     ['asan==1', {
       'sanitizer_type': 'asan',
     }],
     ['msan==1', {
       'sanitizer_type': 'msan',
     }],
     ['tsan==1', {
       'sanitizer_type': 'tsan',
     }],
@@ skipping 191 matching lines @@
     },
     {
       'package_name': 'libfontconfig1',
       'dependencies=': [],
       'extra_configure_flags': [
         '--disable-docs',
         '--sysconfdir=/etc/',
         # 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'],
     },
     {
       'package_name': 'libgcrypt11',
       'dependencies=': [],
       'package_ldflags': ['-Wl,-z,muldefs'],
       'extra_configure_flags': [
         # From debian/rules.
         '--enable-noexecstack',
         '--enable-ld-version-script',
@@ skipping 265 matching lines @@
       'package_cflags': ['-Wno-return-type'],
       'extra_configure_flags': [
           # From debian/rules.
           '--prefix=/usr',
           '--sysconfdir=/etc',
           '--enable-test-print-backend',
           '--enable-introspection=no',
           '--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'],
     },
     {
       'package_name': 'libgdk-pixbuf2.0-0',
       'extra_configure_flags': [
           # From debian/rules.
           '--with-libjasper',
           '--with-x11',
           # Make the build less problematic.
@@ skipping 92 matching lines @@
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }