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}

5 files changed, 10 insertions, 30 deletions

diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index ff7fed2..1d09cb7 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -519,7 +519,6 @@
           '--disable-introspection',
       ],
       'dependencies=': [],
-      'patch': 'patches/libgdk-pixbuf2.0-0.diff',
       'run_before_build': 'scripts/libgdk-pixbuf2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
diff --git a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff b/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff
deleted file mode 100644
index 74288c1..0000000
--- a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN ./gdk-pixbuf/Makefile.am ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Makefile.am
---- ./gdk-pixbuf/Makefile.am	2012-04-14 22:11:34.000000000 +0400
-+++ ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Makefile.am	2014-04-17 19:37:22.105253318 +0400
-@@ -782,7 +782,9 @@ loaders.cache: $(loader_LTLIBRARIES) gdk
- 	LOADERS=`echo libpixbufloader-*.la` ; \
- 	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
-           echo "Writing a loaders.cache file to use when running examples before installing gdk-pixbuf."; \
--	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\
-+    # Use the system-installed gdk-pixbuf-query-loaders. The just-built one \
-+    # won't work. \
-+	  /usr/bin/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\
- 	else \
-           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- 	  touch loaders.cache; \
diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff
index b561b20..e0bf1a8 100644
--- a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff
+++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff
@@ -24,18 +24,3 @@ diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h
  G_END_DECLS
  
  #endif /* __GTK_MENU_SHELL_H__ */
-diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am
---- ./gtk/Makefile.am	2014-05-29 19:39:07.000000000 +0400
-+++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am	2014-05-29 19:42:28.029449496 +0400
-@@ -1391,8 +1391,10 @@ stamp-icons: $(STOCK_ICONS)
- if CROSS_COMPILING
- gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
- else
-+# Use the system-installed, uninstrumented gtk-update-icon-cache. The
-+# just-built one cannot be used because it doesn't have the right RPATH set.
- gtk_update_icon_cache_program =							\
--	   ./gtk-update-icon-cache
-+	   /usr/bin/gtk-update-icon-cache
- endif
- 
- gtkbuiltincache.h: @REBUILD@ stamp-icons
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