diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 13:11:45 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 13:11:45 +0000 |
| commit | d5faae0e2c8e86251ffa7b6dbb1cfa7dc5c4dfa1 (patch) | |
| tree | ef051b6e7af2b7e91651fece4bcf3d7298ef3110 /third_party | |
| parent | 028fc6a834a4d8d2ee1171d214b9f36764af368d (diff) | |
| download | chromium_src-d5faae0e2c8e86251ffa7b6dbb1cfa7dc5c4dfa1.zip chromium_src-d5faae0e2c8e86251ffa7b6dbb1cfa7dc5c4dfa1.tar.gz chromium_src-d5faae0e2c8e86251ffa7b6dbb1cfa7dc5c4dfa1.tar.bz2 | |
Add libcups2 to instrumented libraries.
BUG=313751
R=glider@chromium.org
Review URL: https://codereview.chromium.org/148803003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 16 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/libcups2.diff | 31 | ||||
| -rwxr-xr-x | third_party/instrumented_libraries/libcups2.sh | 9 |
3 files changed, 56 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index d5cba22..9b0f6b4 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -66,6 +66,7 @@ '<(_sanitizer_type)-libfontconfig1', '<(_sanitizer_type)-pulseaudio', '<(_sanitizer_type)-libasound2', + '<(_sanitizer_type)-libcups2', ], 'conditions': [ ['asan==1', { @@ -300,5 +301,20 @@ 'run_before_build': 'libasound2.sh', 'includes': ['standard_instrumented_library_target.gypi'], }, + { + 'library_name': 'libcups2', + 'dependencies=': [], + 'run_before_build': 'libcups2.sh', + 'custom_configure_flags': [ + # Do not touch system-wide directories. + '--with-rcdir=no', + '--with-xinetd=no', + '--with-dbusdir=no', + '--with-menudir=no', + '--with-icondir=no', + '--with-docdir=no' + ], + 'includes': ['standard_instrumented_library_target.gypi'], + }, ], } diff --git a/third_party/instrumented_libraries/libcups2.diff b/third_party/instrumented_libraries/libcups2.diff new file mode 100644 index 0000000..49b262f --- /dev/null +++ b/third_party/instrumented_libraries/libcups2.diff @@ -0,0 +1,31 @@ +diff -rupN ./man/Makefile ../cups-1.5.3-patched/man/Makefile +--- ./man/Makefile 2014-01-31 20:19:55.000000000 +0400 ++++ ../cups-1.5.3-patched/man/Makefile 2014-01-31 20:21:56.449781676 +0400 +@@ -69,6 +69,12 @@ MAN8 = cupsaccept.$(MAN8EXT) \ + + LANGUAGES=de fr + ++# Man pages build may fail. We don't need those in instrumented builds anyway. ++MAN1 = ++MAN5 = ++MAN7 = ++MAN8 = ++ + # + # Make everything... + # +diff -rupN ./man/Makefile.l10n ../cups-1.5.3-patched/man/Makefile.l10n +--- ./man/Makefile.l10n 2014-01-31 20:19:55.000000000 +0400 ++++ ../cups-1.5.3-patched/man/Makefile.l10n 2014-01-31 20:22:13.889535988 +0400 +@@ -57,6 +57,11 @@ MAN8 = cupsaccept.$(MAN8EXT) \ + lpmove.$(MAN8EXT) \ + lpc.$(MAN8EXT) + ++# Man pages build may fail. We don't need those in instrumented builds anyway. ++MAN1 = ++MAN5 = ++MAN7 = ++MAN8 = + + # + # Make everything... diff --git a/third_party/instrumented_libraries/libcups2.sh b/third_party/instrumented_libraries/libcups2.sh new file mode 100755 index 0000000..e614cfb --- /dev/null +++ b/third_party/instrumented_libraries/libcups2.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# 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. + +# This script does some preparations before build of instrumented libcups2. + +# Disable problematic assembly in clang builds. +patch -p1 < $(dirname ${BASH_SOURCE[0]})/libcups2.diff |