mirror of
https://github.com/openwrt/packages.git
synced 2025-02-07 05:49:50 +00:00
d5ed8575e5
refresh patches and build flags according to the upstream changes Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
--- a/usr/Makefile
|
|
+++ b/usr/Makefile
|
|
@@ -1,11 +1,11 @@
|
|
sbindir ?= $(PREFIX)/sbin
|
|
libdir ?= $(PREFIX)/lib/tgt
|
|
|
|
-ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),)
|
|
+ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "signalfd.h" | head -n1) && echo 1),)
|
|
CFLAGS += -DUSE_SIGNALFD
|
|
endif
|
|
|
|
-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
|
|
+ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
|
|
CFLAGS += -DUSE_TIMERFD
|
|
endif
|
|
|
|
@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),)
|
|
CFLAGS += -DUSE_SYSTEMD
|
|
endif
|
|
|
|
-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),)
|
|
+ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "eventfd.h" | head -n1) && test -n $(shell find $(STAGING_DIR)/usr/include -name "libaio.h" | head -n1) && echo 1),)
|
|
CFLAGS += -DUSE_EVENTFD
|
|
TGTD_OBJS += bs_aio.o
|
|
LIBS += -laio
|
|
@@ -56,7 +56,7 @@ ifneq ($(SD_NOTIFY),)
|
|
LIBS += -lsystemd
|
|
endif
|
|
|
|
-PROGRAMS += tgtd tgtadm tgtimg
|
|
+PROGRAMS += tgtd tgtadm
|
|
TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
|
|
concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
|
|
ssc.o libssc.o bs_rdwr.o bs_ssc.o \
|
|
@@ -83,14 +83,6 @@ tgtadm: $(TGTADM_OBJS)
|
|
|
|
-include $(TGTADM_DEP)
|
|
|
|
-TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
|
|
-TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
|
|
-
|
|
-tgtimg: $(TGTIMG_OBJS)
|
|
- $(CC) $^ -o $@
|
|
-
|
|
--include $(TGTIMG_DEP)
|
|
-
|
|
%.o: %.c
|
|
$(CC) -c $(CFLAGS) $*.c -o $*.o
|
|
@$(CC) -MM $(CFLAGS) -MF $*.d -MT $*.o $*.c
|