* [2.29 COMMITTED] memusagestat: use local glibc when linking [BZ #18465]
@ 2019-01-01 0:00 Florian Weimer
2019-01-01 0:00 ` Florian Weimer
0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2019-01-01 0:00 UTC (permalink / raw)
To: libc-stable
From: Mike Frysinger <vapier@gentoo.org>
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)
2019-04-24 Mike Frysinger <vapier@gentoo.org>
[BZ #18465]
* malloc/Makefile (others): Add memusagestat.
($(objpfx)memusagestat): Delete rule.
(LDLIBS-memusagestat): New variable.
diff --git a/NEWS b/NEWS
index 117646df7b..07e099b5ec 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Major new features:
The following bugs are resolved with this release:
[16573] malloc: Set and reset all hooks for tracing
+ [18465] memusagestat: use local glibc when linking
[24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309)
[24164] Systemtap probes need to use "nr" constraint on 32-bit Arm
[24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2
diff --git a/malloc/Makefile b/malloc/Makefile
index ab2eed09c6..aadf602dfd 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))
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.29 COMMITTED] memusagestat: use local glibc when linking [BZ #18465]
2019-01-01 0:00 [2.29 COMMITTED] memusagestat: use local glibc when linking [BZ #18465] Florian Weimer
@ 2019-01-01 0:00 ` Florian Weimer
0 siblings, 0 replies; 2+ messages in thread
From: Florian Weimer @ 2019-01-01 0:00 UTC (permalink / raw)
To: libc-stable
* Florian Weimer:
> From: Mike Frysinger <vapier@gentoo.org>
>
> 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)
I had to rever this because it requires -Wl,-rpath-link= ordering
changes, which are too invasive to backport. The ordering changes
landed in master in commit a8ff215e56050a907189e713fd449bcafe99ff6b
("Makeconfig: Move -Wl,-rpath-link options before library references").
Florian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-26 6:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-01 0:00 [2.29 COMMITTED] memusagestat: use local glibc when linking [BZ #18465] Florian Weimer
2019-01-01 0:00 ` Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).