Instrumented libraries: support building on Ubuntu Trusty (part 1).

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,
   },
 
@@ skipping 98 matching lines @@
         '<(_sanitizer_type)-zlib1g',
         '<(_sanitizer_type)-libglib2.0-0',
         '<(_sanitizer_type)-libdbus-1-3',
         '<(_sanitizer_type)-libdbus-glib-1-2',
         '<(_sanitizer_type)-nss',
         '<(_sanitizer_type)-libfontconfig1',
         '<(_sanitizer_type)-pulseaudio',
         '<(_sanitizer_type)-libasound2',
         '<(_sanitizer_type)-pango1.0',
         '<(_sanitizer_type)-libcap2',
-        '<(_sanitizer_type)-libudev0',
+        '<(_sanitizer_type)-udev',
         '<(_sanitizer_type)-libtasn1-3',
         '<(_sanitizer_type)-libgnome-keyring0',
         '<(_sanitizer_type)-libgtk2.0-0',
         '<(_sanitizer_type)-libgdk-pixbuf2.0-0',
         '<(_sanitizer_type)-libpci3',
         '<(_sanitizer_type)-libdbusmenu-glib4',
-        '<(_sanitizer_type)-liboverlay-scrollbar-0.2-0',
+        '<(_sanitizer_type)-overlay-scrollbar',

[Alexander Potapenko, 2014/09/30 11:03:32]

Are the new package names valid in both Precise and Trusty?

[earthdok, 2014/09/30 11:46:29]

Yes, that's the point.

         '<(_sanitizer_type)-libgconf-2-4',
         '<(_sanitizer_type)-libappindicator1',
         '<(_sanitizer_type)-libdbusmenu',
         '<(_sanitizer_type)-atk1.0',
         '<(_sanitizer_type)-libunity9',
         '<(_sanitizer_type)-dee',
       ],
       'conditions': [
         ['asan==1', {
           'dependencies': [
@@ skipping 101 matching lines @@
     },
     {
       'package_name': 'libglib2.0-0',
       'dependencies=': [],
       'extra_configure_flags': [
         '--disable-gtk-doc',
         '--disable-gtk-doc-html',
         '--disable-gtk-doc-pdf',
       ],
       'asan_blacklist': 'blacklists/asan/libglib2.0-0.txt',
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgpg-error0',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libnspr4',
       'dependencies=': [],
       'extra_configure_flags': [
         '--enable-64bit',
         # TSan reports data races on debug variables.
         '--disable-debug',
       ],
       'run_before_build': 'scripts/libnspr4.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libp11-kit0',
       'dependencies=': [],
+      # Required on Trusty due to autoconf version mismatch.
+      'run_before_build': 'scripts/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libpcre3',
       'dependencies=': [],
       'extra_configure_flags': [
         '--enable-utf8',
         '--enable-unicode-properties',
       ],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libpixman-1-0',
       'dependencies=': [],
       'patch': 'patches/libpixman-1-0.diff',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libpng12-0',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libx11-6',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-specs'],
       'msan_blacklist': 'blacklists/msan/libx11-6.txt',
+      # Required on Trusty due to autoconf version mismatch.
+      'run_before_build': 'scripts/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxau6',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxcb1',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-build-docs'],
+      # Required on Trusty due to autoconf version mismatch.
+      'run_before_build': 'scripts/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxcomposite1',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxcursor1',
       'dependencies=': [],
@@ skipping 132 matching lines @@
       ],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libcap2',
       'dependencies=': [],
       'build_method': 'custom_libcap',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
-      'package_name': 'libudev0',
+      'package_name': 'udev',
       'dependencies=': [],
       'extra_configure_flags': [
           # Without this flag there's a linking step that doesn't honor LDFLAGS
           # and fails.
           # TODO(earthdok): find a better fix.
           '--disable-gudev'
       ],
+      # Required on Trusty due to autoconf version mismatch.
+      'run_before_build': 'scripts/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libtasn1-3',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgnome-keyring0',
       'extra_configure_flags': [
           # Build static libs (from debian/rules).
           '--enable-static',
           '--enable-tests=no',
+          # Make the build less problematic.
+          '--disable-introspection',
       ],
       'package_ldflags': ['-Wl,--as-needed'],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgtk2.0-0',
       'package_cflags': ['-Wno-return-type'],
       'extra_configure_flags': [
           # From debian/rules.
@@ skipping 35 matching lines @@
           # From debian/rules.
           '--disable-scrollkeeper',
           '--enable-gtk-doc',
           # --enable-introspection introduces a build step that attempts to run
           # a just-built binary and crashes. Vala requires introspection.
           # TODO(earthdok): find a better fix.
           '--disable-introspection',
           '--disable-vala',
       ],
       'dependencies=': [],
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
-      'package_name': 'liboverlay-scrollbar-0.2-0',
+      'package_name': 'overlay-scrollbar',
       'extra_configure_flags': [
           '--with-gtk=2',
       ],
       'dependencies=': [],
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgconf-2-4',
       'extra_configure_flags': [
           # From debian/rules. (Even though --with-gtk=3.0 doesn't make sense.)
           '--with-gtk=3.0',
           '--disable-orbit',
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libappindicator1',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'jobs': 1,
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libdbusmenu',
       'extra_configure_flags': [
           # From debian/rules.
           '--disable-scrollkeeper',
           '--with-gtk=2',
           # See above.
           '--disable-introspection',
           '--disable-vala',
       ],
       'dependencies=': [],
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'atk1.0',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libunity9',
       'dependencies=': [],
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'dee',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
+      'run_before_build': 'scripts/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }