net/xl2tpd/patches/0002-Skip-building-pfc.patch

   1 From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001
   2 From: Yousong Zhou <zhouyousong@yunionyun.com>
   3 Date: Fri, 18 Oct 2019 11:29:03 +0000
   4 Subject: [PATCH] Skip building pfc
   5
   6 It can cause build failure, see [1]
   7
   8  [1] https://github.com/openwrt/packages/issues/10270
   9 ---
  10  Makefile | 15 +++------------
  11  1 file changed, 3 insertions(+), 12 deletions(-)
  12
  13 --- a/Makefile
  14 +++ b/Makefile
  15 @@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
  16  MANDIR?=$(DESTDIR)${PREFIX}/share/man
  17
  18
  19 -all: $(EXEC) pfc $(CONTROL_EXEC)
  20 +all: $(EXEC) $(CONTROL_EXEC)
  21
  22  clean:
  23 -       rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
  24 +       rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
  25
  26  $(EXEC): $(OBJS) $(HDRS)
  27         $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
  28 @@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS)
  29  $(CONTROL_EXEC): $(CONTROL_SRCS)
  30         $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
  31
  32 -pfc:
  33 -       $(CC) $(CFLAGS) -c contrib/pfc.c
  34 -       $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
  35 -
  36  romfs:
  37         $(ROMFSINST) /bin/$(EXEC)
  38
  39 @@ -142,7 +138,7 @@ packagingprep:
  40         sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec
  41         sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile
  42
  43 -install: ${EXEC} pfc ${CONTROL_EXEC}
  44 +install: ${EXEC} ${CONTROL_EXEC}
  45         install -d -m 0755 ${SBINDIR}
  46         install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
  47         install -d -m 0755 ${MANDIR}/man5
  48 @@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
  49         install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/
  50         install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
  51                  ${MANDIR}/man5/
  52 -       # pfc
  53 -       install -d -m 0755 ${BINDIR}
  54 -       install -m 0755 pfc ${BINDIR}/pfc
  55 -       install -d -m 0755 ${MANDIR}/man1
  56 -       install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
  57         # control exec
  58         install -d -m 0755 ${SBINDIR}
  59         install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)