From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 18 Oct 2019 11:29:03 +0000 Subject: [PATCH] Skip building pfc It can cause build failure, see [1] [1] https://github.com/openwrt/packages/issues/10270 --- Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9927715..8a3eecd 100644 --- a/Makefile +++ b/Makefile @@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin MANDIR?=$(DESTDIR)${PREFIX}/share/man -all: $(EXEC) pfc $(CONTROL_EXEC) +all: $(EXEC) $(CONTROL_EXEC) clean: - rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC) + rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC) $(EXEC): $(OBJS) $(HDRS) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) @@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS) $(CONTROL_EXEC): $(CONTROL_SRCS) $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@ -pfc: - $(CC) $(CFLAGS) -c contrib/pfc.c - $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS) - romfs: $(ROMFSINST) /bin/$(EXEC) @@ -142,7 +138,7 @@ packagingprep: sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile -install: ${EXEC} pfc ${CONTROL_EXEC} +install: ${EXEC} ${CONTROL_EXEC} install -d -m 0755 ${SBINDIR} install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC) install -d -m 0755 ${MANDIR}/man5 @@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC} install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/ install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \ ${MANDIR}/man5/ - # pfc - install -d -m 0755 ${BINDIR} - install -m 0755 pfc ${BINDIR}/pfc - install -d -m 0755 ${MANDIR}/man1 - install -m 0644 contrib/pfc.1 ${MANDIR}/man1/ # control exec install -d -m 0755 ${SBINDIR} install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)