Revert "memusagestat: use local glibc when linking [BZ #18465]"

This reverts commit 630d7201ceb12f8dcdbe20abce67e1333c5e15ee.

The position of the -Wl,-rpath-link= options on the linker command
line is not correct, so the new way of linking memusagestat does not
always work.

diff --git a/ChangeLog b/ChangeLog
index 609d5c1b19979ca4ecd6d50ec85fe4e9b4a827a3..dd02102d5f60c8e323887b7a16322c56cdddbb1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-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 e8030d499a8ae7a78f86b190f7a6d8838885e899..17b50c7a23f4196ef8bd8cf3c79c172dffcea326 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,6 @@ 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 228a1279a5960d8c1d4ba661ab8ca553abacc01c..388cf7e9ee3a2569ffe0a4ff53ed875f56307b14 100644 (file)
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -131,7 +131,6 @@ 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
@@ -155,7 +154,8 @@ cpp-srcs-left := $(memusagestat-modules)
 lib := memusagestat
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
-LDLIBS-memusagestat = $(libgd-LDFLAGS) -lgd -lpng -lz -lm
+$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
+       $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm
 
 ifeq ($(run-built-tests),yes)
 ifeq (yes,$(build-shared))