diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 14:48:10 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 14:48:10 +0000 |
| commit | f3fd2f212876924829aa8b70eaeb7aed6c421c7a (patch) | |
| tree | 425ca63d78dd024df5248db5a7ecf4bab9800d14 /third_party | |
| parent | 588b0b9d1f2a53232c4071a8b3284f2969303ee5 (diff) | |
| download | chromium_src-f3fd2f212876924829aa8b70eaeb7aed6c421c7a.zip chromium_src-f3fd2f212876924829aa8b70eaeb7aed6c421c7a.tar.gz chromium_src-f3fd2f212876924829aa8b70eaeb7aed6c421c7a.tar.bz2 | |
Instrumented libraries: fix & re-enable zlib1g build.
The version script was being ignored in non-gcc (clang) builds.
BUG=313751
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/315563003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 4 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/zlib1g.diff | 12 | ||||
| -rwxr-xr-x | third_party/instrumented_libraries/zlib1g.sh | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 1edfce8..378adcd7 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -73,8 +73,7 @@ '<(_sanitizer_type)-libxrender1', '<(_sanitizer_type)-libxss1', '<(_sanitizer_type)-libxtst6', - # https://crbug.com/313751#c110 - #'<(_sanitizer_type)-zlib1g', + '<(_sanitizer_type)-zlib1g', '<(_sanitizer_type)-libglib2.0-0', '<(_sanitizer_type)-libdbus-1-3', '<(_sanitizer_type)-libdbus-glib-1-2', @@ -336,6 +335,7 @@ { 'library_name': 'zlib1g', 'dependencies=': [], + 'run_before_build': 'zlib1g.sh', 'includes': ['standard_instrumented_library_target.gypi'], }, { diff --git a/third_party/instrumented_libraries/zlib1g.diff b/third_party/instrumented_libraries/zlib1g.diff new file mode 100644 index 0000000..18a6a33 --- /dev/null +++ b/third_party/instrumented_libraries/zlib1g.diff @@ -0,0 +1,12 @@ +diff -rupN ./configure ../zlib-1.2.3.4.dfsg-patched/configure +--- ./configure 2009-12-24 18:09:43.000000000 +0300 ++++ ../zlib-1.2.3.4.dfsg-patched/configure 2014-06-03 17:53:45.082074669 +0400 +@@ -72,6 +72,8 @@ cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in + *gcc*) gcc=1 ;; ++ # Use the version script for clang builds as well. ++ *clang*) gcc=1 ;; + esac + + if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then diff --git a/third_party/instrumented_libraries/zlib1g.sh b/third_party/instrumented_libraries/zlib1g.sh new file mode 100755 index 0000000..85cdc7b --- /dev/null +++ b/third_party/instrumented_libraries/zlib1g.sh @@ -0,0 +1,8 @@ +#!/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. + +# This script does some preparations before build of instrumented zlib1g. + +patch -p1 < $(dirname ${BASH_SOURCE[0]})/zlib1g.diff |