diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:01:44 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 19:01:44 +0000 |
| commit | b368188a019f8de1faea06073153f9281719ed19 (patch) | |
| tree | 28fc1c74658cca271ffadd1aa2a17e875dcf14a9 /third_party/instrumented_libraries/patches | |
| parent | a45355a5119501bd0cd014d3e80c4f380070cc00 (diff) | |
| download | chromium_src-b368188a019f8de1faea06073153f9281719ed19.zip chromium_src-b368188a019f8de1faea06073153f9281719ed19.tar.gz chromium_src-b368188a019f8de1faea06073153f9281719ed19.tar.bz2 | |
Instrumented libraries: do not assume that "." is not in PATH.
BUG=389216, 313751
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/392713002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/instrumented_libraries/patches')
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff | 2 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgtk2.0-0.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff b/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff index 5bc3963..74288c1 100644 --- a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff +++ b/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff @@ -8,7 +8,7 @@ diff -rupN ./gdk-pixbuf/Makefile.am ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Make - $(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. \ -+ gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\ ++ /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 71a0224..b561b20 100644 --- a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff +++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff @@ -35,7 +35,7 @@ diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am +# just-built one cannot be used because it doesn't have the right RPATH set. gtk_update_icon_cache_program = \ - ./gtk-update-icon-cache -+ gtk-update-icon-cache ++ /usr/bin/gtk-update-icon-cache endif gtkbuiltincache.h: @REBUILD@ stamp-icons |