From: Florian Weimer Date: Thu, 25 Apr 2019 12:59:42 +0000 (+0200) Subject: Revert "memusagestat: use local glibc when linking [BZ #18465]" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b3aac586964f7aee071aa25fef86d53b05d16b2;p=thirdparty%2Fglibc.git 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 609d5c1b199..dd02102d5f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -2019-04-24 Mike Frysinger - - [BZ #18465] - * malloc/Makefile (others): Add memusagestat. - ($(objpfx)memusagestat): Delete rule. - (LDLIBS-memusagestat): New variable. - 2019-04-03 TAMUKI Shoichi [BZ #22964] diff --git a/NEWS b/NEWS index e8030d499a8..17b50c7a23f 100644 --- 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 228a1279a59..388cf7e9ee3 100644 --- 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))