[PATCH][ppc64-diag] Honor compilation env. variables

From: Frederic Bonnard <[email protected]>

On Debian, compilation process expects the upstream Makefile to also take into
account LDFLAGS, CPPFLAGS sent in the environment for hardening :
https://wiki.debian.org/Hardening
This patch enables the Makefile to take into account these variables.

Signed-off-by: Frederic Bonnard <[email protected]>
---
 diags/Makefile                     | 4 ++--
 ela/Makefile                       | 6 +++---
 lpd/Makefile                       | 6 +++---
 opal_errd/Makefile                 | 4 ++--
 opal_errd/opal-elog-parse/Makefile | 2 +-
 rtas_errd/Makefile                 | 6 +++---
 rules.mk                           | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/diags/Makefile b/diags/Makefile
index 5c20a84..a78647e 100644
--- a/diags/Makefile
+++ b/diags/Makefile
@@ -24,11 +24,11 @@ all: $(PROGS)
 
 diag_encl: $(DIAG_ENCL_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	@$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
+	@$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
 
 encl_led: $(ENCL_LED_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	@$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
+	@$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
 
 diag_encl.o: encl_util.h diag_encl.h
 
diff --git a/ela/Makefile b/ela/Makefile
index 2205cd2..0b8afe3 100644
--- a/ela/Makefile
+++ b/ela/Makefile
@@ -25,15 +25,15 @@ all: $(CMDS) $(CATALOG) $(CATALOG_REGEX)
 
 explain_syslog: $(ES_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CXX) $(CXXFLAGS) -o $@ $^ 
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
 syslog_to_svclog: $(SS_OBJS) 
 	@echo "LD $(WORK_DIR)/$@"
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(SS_LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(SS_LIBS)
 
 add_regex: $(AR_OBJS)
 	@echo "LD $(WORK_DIR)/$@" 
-	$(CXX) $(CXXFLAGS) -o $@ $^
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
 rr.tab.o: rr.tab.c rr.tab.h catalogs.h
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c rr.tab.c
diff --git a/lpd/Makefile b/lpd/Makefile
index c859db7..9390fd3 100644
--- a/lpd/Makefile
+++ b/lpd/Makefile
@@ -26,15 +26,15 @@ all: $(CMDS)
 
 lp_diag: $(LP_DIAG_OBJS) $(COMMON_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(COMMON_LIBS) $(LP_DIAG_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(COMMON_LIBS) $(LP_DIAG_LIBS)
 
 usysident: $(USYSIDENT_OBJS) $(COMMON_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(COMMON_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(COMMON_LIBS)
 
 usysattn: $(USYSIDENT_OBJS) $(COMMON_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(COMMON_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(COMMON_LIBS)
 
 install: all
 	@$(call install_sbin,$(CMDS),$(DESTDIR))
diff --git a/opal_errd/Makefile b/opal_errd/Makefile
index d7d0a07..b5a3813 100644
--- a/opal_errd/Makefile
+++ b/opal_errd/Makefile
@@ -16,11 +16,11 @@ all: $(CMDS)
 
 opal_errd: $(OPAL_ERRD_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(OPAL_ERRD_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(OPAL_ERRD_LIBS)
 
 extract_opal_dump: $(OPAL_DUMP_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(OPAL_DUMP_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(OPAL_DUMP_LIBS)
 
 opal-elog-parse/opal-event-data.o:
 	@$(MAKE) -C opal-elog-parse opal-event-data.o
diff --git a/opal_errd/opal-elog-parse/Makefile b/opal_errd/opal-elog-parse/Makefile
index 82ac523..0ca78f6 100644
--- a/opal_errd/opal-elog-parse/Makefile
+++ b/opal_errd/opal-elog-parse/Makefile
@@ -30,7 +30,7 @@ all: $(CMDS)
 
 opal-elog-parse: $(OPAL_ELOG_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	$(Q)$(CC) $(CFLAGS) -o $@ $^
+	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
 
 opal-elog-parse.o: opal-elog-parse.c parse-opal-event.h libopalevents.h opal-event-data.h
 	@echo "CC $(WORK_DIR)/$@"
diff --git a/rtas_errd/Makefile b/rtas_errd/Makefile
index b60940c..8d67ff9 100644
--- a/rtas_errd/Makefile
+++ b/rtas_errd/Makefile
@@ -26,15 +26,15 @@ all: $(CMDS) $(SCRIPTS)
 
 rtas_errd: $(RTAS_ERRD_OBJS) $(COMMON_UTILS_OBJ)
 	@echo "LD $(WORK_DIR)/$@"
-	$(CC) $(CFLAGS) -o $@ $^ $(RTAS_ERRD_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(RTAS_ERRD_LIBS)
 
 convert_dt_node_props: $(DT_NODE_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	@$(CC) $(CFLAGS) -o $@ $^
+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
 
 extract_platdump: $(EXTRACT_PLATDUMP_OBJS)
 	@echo "LD $(WORK_DIR)/$@"
-	@$(CC) $(CFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
 
 install: all
 	@$(call install_sbin,$(CMDS),$(DESTDIR))
diff --git a/rules.mk b/rules.mk
index f3c8334..926a8ca 100644
--- a/rules.mk
+++ b/rules.mk
@@ -212,6 +212,6 @@ CLEAN = @echo ""
 # Default target for building object files
 %.o: %.c
 	@echo "CC $(WORK_DIR)/$@"
-	@$(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
+	@$(CC) -c $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $<
 
 
-- 
2.1.4


------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity 
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e