qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 630d7201ce.

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.
This commit is contained in:
Florian Weimer 2019-04-25 14:59:42 +02:00
parent 630d7201ce
commit 9b3aac5869
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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]

1
NEWS
View File

@ -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

4
malloc/Makefile
View File

@ -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))