diff options
| author | earthdok <earthdok@chromium.org> | 2014-09-30 12:12:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 19:12:52 +0000 |
| commit | 72058c85190c68b203bf7ed0099f86307ee4ecaf (patch) | |
| tree | 195b653535d736ed8424fdb505e2ac7541022620 /third_party/instrumented_libraries/scripts | |
| parent | 1a1faa8e07d852a65650779f5f5d019199a1b05b (diff) | |
| download | chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.zip chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.tar.gz chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.tar.bz2 | |
Instrumented libraries: replace some makefile patches with sed invocations.
Some cases are simple enough that a search and replace is sufficient. At the
same time, the fewer patches we have, the less time will be spent rebasing them.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/618013002
Cr-Commit-Position: refs/heads/master@{#297474}
Diffstat (limited to 'third_party/instrumented_libraries/scripts')
| -rwxr-xr-x | third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh | 5 | ||||
| -rwxr-xr-x | third_party/instrumented_libraries/scripts/libgtk2.0-0.sh | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh b/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh index e143344..254804a 100755 --- a/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh +++ b/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh @@ -5,4 +5,9 @@ # This script does some preparations before build of instrumented libgdk-pixbuf2.0-0. +# Use the system-installed gdk-pixbuf-query-loaders during building. Normally a +# just-built one is used, however in MSan builds it will crash due to +# uninstrumented dependencies. + +sed -i "s|\$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders|/usr/bin/gdk-pixbuf-query-loaders|g" gdk-pixbuf/Makefile.am autoreconf diff --git a/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh b/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh index e3c7360..adaf38f 100755 --- a/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh +++ b/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh @@ -5,4 +5,9 @@ # This script does some preparations before build of instrumented libgtk2.0-0. +# Use the system-installed gtk-update-icon-cache during building. Normally a +# just-built one is used, however in MSan builds it will crash due to +# uninstrumented dependencies. + +sed -i "s|./gtk-update-icon-cache|/usr/bin/gtk-update-icon-cache|g" gtk/Makefile.am autoreconf |