diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-07-26 20:07:54 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-26 20:07:54 +0000 |
| commit | f42b906bc4359d4a18b51fefa3423716c0af30a8 (patch) | |
| tree | e55f7294941844761601fffa104ab9e51321e16d /packages/glibc/glibc-2.3.6/glibc-memusage.patch | |
| parent | 38c0392e6849f181119aef9b231e97c64a77e1d4 (diff) | |
| parent | 7cff782b984312bb9d3226d9e44cb2b9a9401a81 (diff) | |
merge of '3f2ba26557bb371913a11a48aa9bcb4f58fd6fe5'
and '4a6eea520cb0bded1313d57689af2993701d4e87'
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" + |