diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-25 01:47:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-25 01:47:17 +0000 |
| commit | 68446fb9940af94c377b2552a45d12d5e3e542e2 (patch) | |
| tree | 5fbed6ba6fa9730c87fce88f5f630f92e5f593e1 /packages/glibc/glibc-2.3.6/glibc-memusage.patch | |
| parent | 4cd01810c3a17b4d8e65383c363eb8eefbda36dc (diff) | |
| parent | 3c011708443e648c0fdc52c796215266fbb95d4a (diff) | |
merge of '3421ff70666434c0c8110de81d4810e43ef46a69'
and '7740f57201d1a3339463ab6ee1a56af6dbbd5b7a'
Diffstat (limited to 'packages/glibc/glibc-2.3.6/glibc-memusage.patch')
| -rw-r--r-- | packages/glibc/glibc-2.3.6/glibc-memusage.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/packages/glibc/glibc-2.3.6/glibc-memusage.patch b/packages/glibc/glibc-2.3.6/glibc-memusage.patch new file mode 100644 index 0000000000..39ca1a77b5 --- /dev/null +++ b/packages/glibc/glibc-2.3.6/glibc-memusage.patch @@ -0,0 +1,44 @@ +--- + malloc/Makefile | 4 +++- + malloc/memusage.sh | 6 ++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +Index: glibc-2.3.6/malloc/Makefile +=================================================================== +--- glibc-2.3.6.orig/malloc/Makefile 2008-07-17 14:40:54.000000000 -0700 ++++ glibc-2.3.6/malloc/Makefile 2008-07-17 14:42:07.000000000 -0700 +@@ -80,7 +80,7 @@ ifneq ($(cross-compiling),yes) + ifneq ($(LIBGD),no) + install-bin = memusagestat + install-bin-script += memusage +-generated += memusagestat memusage ++generated += memusagestat + extra-objs += memusagestat.o + + # The configure.in check for libgd and its headers did not use $SYSINCLUDES. +@@ -90,6 +90,8 @@ extra-objs += memusagestat.o + $(objpfx)memusagestat.o: sysincludes = # nothing + endif + endif ++install-bin-script += memusage ++generated += memusage + + # Another goal which can be used to override the configure decision. + .PHONY: do-memusagestat +Index: glibc-2.3.6/malloc/memusage.sh +=================================================================== +--- glibc-2.3.6.orig/malloc/memusage.sh 2008-07-17 14:42:17.000000000 -0700 ++++ glibc-2.3.6/malloc/memusage.sh 2008-07-17 14:42:54.000000000 -0700 +@@ -205,6 +205,12 @@ if test $# -eq 0; then + do_usage + fi + ++# Find memusagestat. ++if test -n "$png" -a ! -x $memusagestat; then ++ echo >&2 $"PNG generation is not supported." ++ png="" ++fi ++ + # This will be in the environment. + add_env="LD_PRELOAD=$memusageso" + |