67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From 0744a268bc73e42b14b83e4cf3d083c6df6344e8 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu, 25 Apr 2019 14:58:13 +0200
|
|
Subject: [PATCH 15] Revert "memusagestat: use local glibc when linking [BZ
|
|
#18465]"
|
|
|
|
This reverts commit 42dfc13abf6fbb4c7a0215238eb636b7d374e0e0.
|
|
|
|
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.
|
|
---
|
|
ChangeLog | 7 -------
|
|
NEWS | 1 -
|
|
malloc/Makefile | 4 ++--
|
|
3 files changed, 2 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 5291a88f85..077d0dae29 100644
|
|
--- 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-09 Carlos O'Donell <carlos@redhat.com>
|
|
Kwok Cheung Yeung <kcy@codesourcery.com>
|
|
|
|
diff --git a/NEWS b/NEWS
|
|
index 07e099b5ec..117646df7b 100644
|
|
--- a/NEWS
|
|
+++ b/NEWS
|
|
@@ -14,7 +14,6 @@ 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 aadf602dfd..ab2eed09c6 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))
|
|
|