cflags_ldflags.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From: Ruben Undheim <ruben.undheim@gmail.com>
  2. Date: Sat, 4 Aug 2018 13:17:43 +0000
  3. Subject: Using LDFLAGS and CPPFLAGSpassed down from
  4. dpkg-buildflags such that hardening gets enabled.
  5. Forwarded: doesn't make sense upstream
  6. ===================================================================
  7. ---
  8. Makefile | 12 ++++++------
  9. 1 file changed, 6 insertions(+), 6 deletions(-)
  10. diff --git a/Makefile b/Makefile
  11. index 68651d2..781826d 100644
  12. --- a/Makefile
  13. +++ b/Makefile
  14. @@ -175,27 +175,27 @@ DEP := $(OBJ:.o=.d)
  15. %.o: %.c
  16. @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
  17. - $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< -o $@
  18. + $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -o $@
  19. %.o: %.cc
  20. @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
  21. - $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
  22. + $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
  23. %.o: %.cpp
  24. @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
  25. - $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
  26. + $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
  27. %.d: %.c
  28. @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
  29. - $(VERBOSE)$(ABCSRC)/depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< > $@
  30. + $(VERBOSE)$(ABCSRC)/depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
  31. %.d: %.cc
  32. @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
  33. - $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< > $@
  34. + $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< > $@
  35. %.d: %.cpp
  36. @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
  37. - $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< > $@
  38. + $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< > $@
  39. ifndef ABC_MAKE_NO_DEPS
  40. -include $(DEP)