diff options
author | earthdok <earthdok@chromium.org> | 2014-09-30 04:47:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 11:47:53 +0000 |
commit | 01cd163972fb6a5b08654979a82025b2baccf4a7 (patch) | |
tree | c3680ba775a09870eda9f4fde4c1c59bccdfc0d4 /third_party/instrumented_libraries/scripts | |
parent | b0d1b1dc4910f1170046fc0d1a9605212782d4da (diff) | |
download | chromium_src-01cd163972fb6a5b08654979a82025b2baccf4a7.zip chromium_src-01cd163972fb6a5b08654979a82025b2baccf4a7.tar.gz chromium_src-01cd163972fb6a5b08654979a82025b2baccf4a7.tar.bz2 |
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}
Diffstat (limited to 'third_party/instrumented_libraries/scripts')
-rwxr-xr-x | third_party/instrumented_libraries/scripts/autogen.sh | 21 | ||||
-rwxr-xr-x | third_party/instrumented_libraries/scripts/autoreconf.sh | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/scripts/autogen.sh b/third_party/instrumented_libraries/scripts/autogen.sh new file mode 100755 index 0000000..7b3b390 --- /dev/null +++ b/third_party/instrumented_libraries/scripts/autogen.sh @@ -0,0 +1,21 @@ +#!/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 diff --git a/third_party/instrumented_libraries/scripts/autoreconf.sh b/third_party/instrumented_libraries/scripts/autoreconf.sh new file mode 100755 index 0000000..138fabe --- /dev/null +++ b/third_party/instrumented_libraries/scripts/autoreconf.sh @@ -0,0 +1,6 @@ +#!/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 |