Ludwig Nussel
5fb68588dd
iproute2 4.13 OBS-URL: https://build.opensuse.org/request/show/521631 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=147
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From: Marcus Meissner <meissner@suse.com>
|
|
Date: Sat, 10 Jun 2017 14:29:22 +0000
|
|
Subject: split link and compile steps for binaries
|
|
Patch-mainline: Submitted - 20170804
|
|
|
|
Do not compile and link in one step so that CFLAGS and LDFLAGS are only
|
|
applied to the phase they are intended for. This is needed for PIE default
|
|
to work.
|
|
---
|
|
misc/Makefile | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/misc/Makefile b/misc/Makefile
|
|
index fa90308e4848..5445bbc08356 100644
|
|
--- a/misc/Makefile
|
|
+++ b/misc/Makefile
|
|
@@ -17,6 +17,7 @@ endif
|
|
ifeq ($(IP_CONFIG_SETNS),y)
|
|
CFLAGS += -DHAVE_SETNS
|
|
endif
|
|
+CFLAGS += -I$(DBM_INCLUDE)
|
|
|
|
ifeq ($(HAVE_MNL),y)
|
|
CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
|
|
@@ -28,17 +29,17 @@ all: $(TARGETS)
|
|
ss: $(SSOBJ)
|
|
$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
|
|
|
|
-nstat: nstat.c
|
|
- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LDLIBS) -lm
|
|
+nstat: nstat.o
|
|
+ $(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LDLIBS) -lm
|
|
|
|
-ifstat: ifstat.c
|
|
- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LDLIBS) -lm
|
|
+ifstat: ifstat.o
|
|
+ $(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LDLIBS) -lm
|
|
|
|
-rtacct: rtacct.c
|
|
- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm
|
|
+rtacct: rtacct.o
|
|
+ $(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LDLIBS) -lm
|
|
|
|
-arpd: arpd.c
|
|
- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb -lpthread
|
|
+arpd: arpd.o
|
|
+ $(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb -lpthread
|
|
|
|
ssfilter.c: ssfilter.y
|
|
$(QUIET_YACC)bison ssfilter.y -o ssfilter.c
|
|
--
|
|
2.14.1
|
|
|