You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

56 lines
1.7 KiB

  1. --- tgt-1.0.48.orig/usr/Makefile 2014-06-04 15:03:53.000000000 +0300
  2. +++ tgt-1.0.48/usr/Makefile 2014-06-04 15:17:56.373670618 +0300
  3. @@ -1,13 +1,13 @@
  4. sbindir ?= $(PREFIX)/sbin
  5. libdir ?= $(PREFIX)/lib/tgt
  6. -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
  7. +#ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
  8. CFLAGS += -DUSE_SIGNALFD
  9. -endif
  10. +#endif
  11. -ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
  12. +#ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),)
  13. CFLAGS += -DUSE_TIMERFD
  14. -endif
  15. +#endif
  16. TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
  17. iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
  18. @@ -25,8 +25,9 @@
  19. CFLAGS += -DUSE_SYSTEMD
  20. endif
  21. -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
  22. -CFLAGS += -DUSE_EVENTFD
  23. +#ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
  24. +ifneq ((test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),)
  25. +CFLAGS += -DUSE_EVENTFD -I$(STAGING_DIR)/usr/include/
  26. TGTD_OBJS += bs_aio.o
  27. LIBS += -laio
  28. endif
  29. @@ -55,7 +56,7 @@
  30. LIBS += -lsystemd-daemon
  31. endif
  32. -PROGRAMS += tgtd tgtadm tgtimg
  33. +PROGRAMS += tgtd tgtadm
  34. TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
  35. concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
  36. ssc.o libssc.o bs_rdwr.o bs_ssc.o \
  37. @@ -82,14 +83,8 @@
  38. -include $(TGTADM_DEP)
  39. -TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
  40. TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
  41. -tgtimg: $(TGTIMG_OBJS)
  42. - $(CC) $^ -o $@
  43. -
  44. --include $(TGTIMG_DEP)
  45. -
  46. %.o: %.c
  47. $(CC) -c $(CFLAGS) $*.c -o $*.o
  48. @$(CC) -MM $(CFLAGS) -MF $*.d -MT $*.o $*.c