1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
|
Description: Add security flags to LDFLAGS for Linux. Include $(CPPFLAGS)
for devices.cpp and libnethogs.cpp.
Author: Matheus Polkorny <mpolkorny@gmail.com>
Forwarded: https://github.com/raboof/nethogs/pull/290
Applied-Upstream: https://github.com/raboof/nethogs/commit/90c1abc2fbee382d94f7d27bf3ee9203a347e09f
Last-Update: 2025-03-26
---
--- a/src/MakeLib.mk
+++ b/src/MakeLib.mk
@@ -10,7 +10,7 @@ all: $(LIBNAME) libnethogs.a
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
- LDFLAGS:= -shared -Wl,-soname,$(SO_NAME)
+ LDFLAGS:= -shared -Wl,-soname,$(SO_NAME) -Wl,-z,now -Wl,-z,relro
else ifeq ($(UNAME_S),FreeBSD)
LDFLAGS:= -shared -Wl,-soname,$(SO_NAME)
else
@@ -97,11 +97,11 @@ $(ODIR)/conninode.o: conninode.cpp nethogs.h conninode.h
$(ODIR)/devices.o: devices.cpp devices.h
@mkdir -p $(ODIR)
- $(CXX) $(CXXFLAGS) -o $@ -c devices.cpp
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c devices.cpp
$(ODIR)/libnethogs.o: libnethogs.cpp libnethogs.h
@mkdir -p $(ODIR)
- $(CXX) $(CXXFLAGS) -o $@ -c libnethogs.cpp -DVERSION=\"$(LIBVERSION)\"
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c libnethogs.cpp -DVERSION=\"$(LIBVERSION)\"
.PHONY: clean
clean:
|