Commit e8038695 authored by thomasanderson's avatar thomasanderson Committed by Commit bot

Add libgnutls26 to instrumented libraries

BUG=716118
R=eugenis@chromium.org

Review-Url: https://codereview.chromium.org/2851493005
Cr-Commit-Position: refs/heads/master@{#467923}
parent 8354c1c1
...@@ -152,7 +152,10 @@ if (use_locally_built_instrumented_libraries) { ...@@ -152,7 +152,10 @@ if (use_locally_built_instrumented_libraries) {
":zlib1g", ":zlib1g",
] ]
if (is_msan) { if (is_msan) {
deps += [ ":libcups2" ] deps += [
":libcups2",
":libgnutls26",
]
} }
if (!is_tsan) { if (!is_tsan) {
deps += [ ":libpng12-0" ] deps += [ ":libpng12-0" ]
...@@ -545,6 +548,18 @@ if (use_locally_built_instrumented_libraries) { ...@@ -545,6 +548,18 @@ if (use_locally_built_instrumented_libraries) {
package_ldflags = [ "-Wl,--as-needed" ] package_ldflags = [ "-Wl,--as-needed" ]
} }
instrumented_library("libgnutls26") {
extra_configure_flags = [
# from debian/rules.
"--enable-ld-version-script",
"--enable-cxx",
"--without-lzo",
"--disable-guile",
"--with-libgcrypt",
"--with-packager=Debian",
]
}
instrumented_library("libgpg-error0") { instrumented_library("libgpg-error0") {
extra_configure_flags = [ "--disable-static" ] extra_configure_flags = [ "--disable-static" ]
} }
......
...@@ -83,9 +83,9 @@ fi ...@@ -83,9 +83,9 @@ fi
# for reasons which are not entirely clear. # for reasons which are not entirely clear.
sudo apt-get install libltdl3-dev libjson0-dev \ sudo apt-get install libltdl3-dev libjson0-dev \
libsndfile1-dev libspeexdsp-dev libjack0 \ libsndfile1-dev libspeexdsp-dev libjack0 \
chrpath -y # Chrpath is required by fix_rpaths.sh. chrpath -y --force-yes # Chrpath is required by fix_rpaths.sh.
sudo apt-get build-dep -y $packages sudo apt-get build-dep -y --force-yes $packages
if test "$ubuntu_release" = "trusty" ; then if test "$ubuntu_release" = "trusty" ; then
# On Trusty, build deps for some of the instrumented packages above conflict # On Trusty, build deps for some of the instrumented packages above conflict
......
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