Commit 01cd1639 authored by earthdok's avatar earthdok Committed by Commit bot

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

- use more generic names for some packages. The new names are valid on both
Precise and Trusty,
- for some packages, run autoreconf or ./autogen.sh before building. This is
required sometimes because the pre-generated configure script was generated
using an older autoconf version than the one used on Trusty. Some packages don't
even contain a pre-generated configure script.

BUG=414189
R=glider@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/612153002

Cr-Commit-Position: refs/heads/master@{#297408}
parent b0d1b1dc
......@@ -116,14 +116,14 @@
'<(_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',
'<(_sanitizer_type)-libgconf-2-4',
'<(_sanitizer_type)-libappindicator1',
'<(_sanitizer_type)-libdbusmenu',
......@@ -245,6 +245,7 @@
'--disable-gtk-doc-pdf',
],
'asan_blacklist': 'blacklists/asan/libglib2.0-0.txt',
'run_before_build': 'scripts/autogen.sh',
'includes': ['standard_instrumented_package_target.gypi'],
},
{
......@@ -266,6 +267,8 @@
{
'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'],
},
{
......@@ -293,6 +296,8 @@
'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'],
},
{
......@@ -304,6 +309,8 @@
'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'],
},
{
......@@ -456,7 +463,7 @@
'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
......@@ -464,6 +471,8 @@
# 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'],
},
{
......@@ -477,6 +486,8 @@
# Build static libs (from debian/rules).
'--enable-static',
'--enable-tests=no',
# Make the build less problematic.
'--disable-introspection',
],
'package_ldflags': ['-Wl,--as-needed'],
'dependencies=': [],
......@@ -532,14 +543,16 @@
'--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'],
},
{
......@@ -562,6 +575,7 @@
],
'dependencies=': [],
'jobs': 1,
'run_before_build': 'scripts/autogen.sh',
'includes': ['standard_instrumented_package_target.gypi'],
},
{
......@@ -575,6 +589,7 @@
'--disable-vala',
],
'dependencies=': [],
'run_before_build': 'scripts/autogen.sh',
'includes': ['standard_instrumented_package_target.gypi'],
},
{
......@@ -589,6 +604,7 @@
{
'package_name': 'libunity9',
'dependencies=': [],
'run_before_build': 'scripts/autogen.sh',
'includes': ['standard_instrumented_package_target.gypi'],
},
{
......@@ -598,6 +614,7 @@
'--disable-introspection',
],
'dependencies=': [],
'run_before_build': 'scripts/autogen.sh',
'includes': ['standard_instrumented_package_target.gypi'],
},
],
......
#!/bin/bash
# Copyright 2014 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.
# Sometimes there isn't a pre-generated configure script, and we must first run
# autogen.sh to generate it. Even if there is one, sometimes we need to
# re-generate it (in particular, the autoconf version on Trusty is newer than
# what is expected by pre-generated configure scripts in some packages).
# Unfortunately, we can't run autogen.sh unconditionally whenever it's present,
# as that sometimes breaks build. Which is why we have this file.
# Also, some packages may or may not have an autogen script, depending on
# version. Rather than clutter the GYP file with conditionals, we simply do
# nothing if the file is not present.
if [ -x ./autogen.sh ]
then
NOCONFIGURE=1 ./autogen.sh
fi
#!/bin/bash
# Copyright 2014 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.
autoreconf --force
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment