mrouted-3.9.4-makefile-flags.patch 2.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. ---
  2. Makefile | 20 +++++++++-----------
  3. 1 file changed, 9 insertions(+), 11 deletions(-)
  4. Index: mrouted-3.9.4/Makefile
  5. ===================================================================
  6. --- mrouted-3.9.4.orig/Makefile
  7. +++ mrouted-3.9.4/Makefile
  8. @@ -42,11 +42,9 @@
  9. #MSTAT_OBJS = mstat.o $(EXTRA_OBJS)
  10. ## Common
  11. -CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
  12. -CFLAGS += -O2 -W -Wall -Werror
  13. -#CFLAGS += -O -g
  14. -LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
  15. -LDFLAGS += -Wl,-Map,$@.map
  16. +MROUTED_CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
  17. +LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
  18. +MROUTED_LDFLAGS += -Wl,-Map,$@.map
  19. OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \
  20. $(MTRACE_OBJS) $(MSTAT_OBJS)
  21. SRCS = $(OBJS:.o=.c)
  22. @@ -65,7 +63,7 @@
  23. .c.o:
  24. @printf " CC $@\n"
  25. - @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
  26. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(CPPFLAGS) -c -o $@ $<
  27. install: $(EXECS)
  28. @install -d $(DESTDIR)$(prefix)/sbin
  29. @@ -95,26 +93,26 @@
  30. mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS)
  31. @printf " LINK $@\n"
  32. - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
  33. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
  34. vers.c: Makefile
  35. @echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
  36. map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS)
  37. @printf " LINK $@\n"
  38. - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
  39. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
  40. mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS)
  41. @printf " LINK $@\n"
  42. - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
  43. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
  44. mtrace: $(IGMP_OBJS) $(MTRACE_OBJS)
  45. @printf " LINK $@\n"
  46. - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
  47. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
  48. mstat: $(MSTAT_OBJS) $(CMULIBS)
  49. @printf " LINK $@\n"
  50. - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
  51. + @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
  52. clean: $(SNMPCLEAN)
  53. -@$(RM) $(OBJS) $(EXECS)