diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2019-04-24 19:30:53 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-04-24 19:30:53 +0200 |
| commit | 630d7201ceb12f8dcdbe20abce67e1333c5e15ee (patch) | |
| tree | 6633ad86d2a3015f3bf00eb68407ff5dde5ddd68 | |
| parent | 7423da211d1490d9fc76c2f0ce49e5dd90ea9bcc (diff) | |
| download | glibc-630d7201ceb12f8dcdbe20abce67e1333c5e15ee.tar glibc-630d7201ceb12f8dcdbe20abce67e1333c5e15ee.tar.gz glibc-630d7201ceb12f8dcdbe20abce67e1333c5e15ee.tar.bz2 glibc-630d7201ceb12f8dcdbe20abce67e1333c5e15ee.zip | |
memusagestat: use local glibc when linking [BZ #18465]
The memusagestat is the only binary that has its own link line which
causes it to be linked against the existing installed C library. It
has been this way since it was originally committed in 1999, but I
don't see any reason as to why. Since we want all the programs we
build locally to be against the new copy of glibc, change the build
to be like all other programs.
(cherry picked from commit f9b645b4b0a10c43753296ce3fa40053fa44606a)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | malloc/Makefile | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -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] @@ -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)) |