openwrt/package/ser/patches/200-no_libfl.patch

   1 Binary files ser-0.8.14.old/.cfg.lex.swp and ser-0.8.14.dev/.cfg.lex.swp differ
   2 diff -urN ser-0.8.14.old/Makefile.defs ser-0.8.14.dev/Makefile.defs
   3 --- ser-0.8.14.old/Makefile.defs        2004-07-27 13:38:33.000000000 +0200
   4 +++ ser-0.8.14.dev/Makefile.defs        2005-05-01 01:18:12.000000000 +0200
   5 @@ -660,7 +660,7 @@
   6  endif
   7  YACC_FLAGS=-d -b cfg
   8  # on solaris add -lxnet (e.g. LIBS= -lxnet)
   9 -LIBS= -lfl -ldl -lresolv
  10 +LIBS=  -ldl -lresolv
  11
  12
  13  #os specific stuff
  14 @@ -695,7 +695,7 @@
  15  ifeq ($(CC_NAME), suncc)
  16         LIBS= -lfast -ldl -lresolv
  17  endif
  18 -       LIBS+= -L/usr/local/lib -lfl -lxnet -lrt -lnsl
  19 +       LIBS+= -L/usr/local/lib  -lxnet -lrt -lnsl
  20         # -lrt needed for sched_yield
  21  endif
  22
  23 @@ -705,9 +705,9 @@
  24         ifneq ($(found_lock_method), yes)
  25                 DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
  26                 found_lock_method=yes
  27 -               LIBS= -pthread -lfl  #dlopen is in libc
  28 +               LIBS= -pthread   #dlopen is in libc
  29         else
  30 -               LIBS= -lfl  #dlopen is in libc
  31 +               LIBS=   #dlopen is in libc
  32         endif
  33         YACC=yacc
  34  endif
  35 @@ -722,7 +722,7 @@
  36         # (symbols on openbsd are prefixed by "_")
  37         YACC=yacc
  38         # no sched_yield on openbsd unless linking with c_r (not recommended)
  39 -       LIBS= -lfl
  40 +       LIBS=
  41         OPENBSD_IS_AOUT= $(shell echo "$(OSREL)" | \
  42                                 sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/')
  43
  44 @@ -740,7 +740,7 @@
  45                 found_lock_method=yes
  46         endif
  47         YACC=yacc
  48 -       LIBS= -lfl
  49 +       LIBS=
  50  endif
  51
  52  # OS X support, same as freebsd
  53 @@ -754,9 +754,9 @@
  54         ifneq ($(found_lock_method), yes)
  55                 DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
  56                 found_lock_method=yes
  57 -               LIBS= -pthread -lfl -lresolv  #dlopen is in libc
  58 +               LIBS= -pthread  -lresolv  #dlopen is in libc
  59         else
  60 -               LIBS= -lfl -lresolv  #dlopen is in libc
  61 +               LIBS=  -lresolv  #dlopen is in libc
  62         endif
  63         LDFLAGS=        # darwin doesn't like -O2 or -E
  64         MOD_LDFLAGS= -bundle -bundle_loader ../../$(MAIN_NAME)
  65 diff -urN ser-0.8.14.old/cfg.lex ser-0.8.14.dev/cfg.lex
  66 --- ser-0.8.14.old/cfg.lex      2004-02-12 17:17:48.000000000 +0100
  67 +++ ser-0.8.14.dev/cfg.lex      2005-05-01 01:23:03.000000000 +0200
  68 @@ -71,7 +71,10 @@
  69
  70         static char* addstr(char*, char**);
  71         static void count();
  72 -
  73 +       int yywrap(void)
  74 +       {
  75 +               return 1;
  76 +       }
  77
  78  %}
  79