patch-Makefile 1.6 KB

1234567891011121314151617181920212223242526272829303132333435
  1. --- mdadm-3.2.5.orig/Makefile 2012-05-18 09:10:03.000000000 +0200
  2. +++ mdadm-3.2.5/Makefile 2012-07-25 13:51:12.000000000 +0200
  3. @@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
  4. CC = $(CROSS_COMPILE)gcc
  5. CXFLAGS = -ggdb
  6. -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
  7. +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
  8. ifdef WARN_UNUSED
  9. CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
  10. endif
  11. @@ -76,7 +76,8 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo
  12. DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
  13. DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
  14. DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
  15. -CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
  16. +CFLAGS ?=
  17. +CFLAGS += $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
  18. # The glibc TLS ABI requires applications that call clone(2) to set up
  19. # TLS data structures, use pthreads until mdmon implements this support
  20. @@ -231,9 +232,10 @@ $(MON_OBJS) : $(INCL) mdmon.h
  21. sha1.o : sha1.c sha1.h md5.h
  22. $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
  23. -install : mdadm mdmon install-man install-udev
  24. - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
  25. - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
  26. +install : mdadm mdmon
  27. + $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
  28. + $(INSTALL) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
  29. + $(INSTALL) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
  30. install-static : mdadm.static install-man
  31. $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm