diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | malloc/Makefile | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dd02102d5f..609d5c1b19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-04-24 Mike Frysinger <vapier@gentoo.org> + + [BZ #18465] + * malloc/Makefile (others): Add memusagestat. + ($(objpfx)memusagestat): Delete rule. + (LDLIBS-memusagestat): New variable. + 2019-04-03 TAMUKI Shoichi <tamuki@linet.gr.jp> [BZ #22964] diff --git a/NEWS b/NEWS index 17b50c7a23..e8030d499a 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,7 @@ Deprecated and removed features, and other changes affecting compatibility: The following bugs are resolved with this release: + [18465] memusagestat: use local glibc when linking [19444] build failures with -O1 due to -Wmaybe-uninitialized [20018] getaddrinfo should reject IP addresses with trailing characters [20209] localedata: Spelling mistake for Sunday in Greenlandic kl_GL diff --git a/malloc/Makefile b/malloc/Makefile index 388cf7e9ee..228a1279a5 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -131,6 +131,7 @@ ifneq ($(cross-compiling),yes) # If the gd library is available we build the `memusagestat' program. ifneq ($(LIBGD),no) others: $(objpfx)memusage +others += memusagestat install-bin = memusagestat install-bin-script += memusage generated += memusagestat memusage @@ -154,8 +155,7 @@ cpp-srcs-left := $(memusagestat-modules) lib := memusagestat include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) -$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o) - $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm +LDLIBS-memusagestat = $(libgd-LDFLAGS) -lgd -lpng -lz -lm ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) |