net/openl2tp/patches/001-makefile.patch

   1 --- orig/Makefile       2010-03-18 14:04:47.000000000 +0500
   2 +++ new/Makefile        2010-10-28 07:30:10.673418106 +0600
   3 @@ -8,7 +8,7 @@
   4  L2TP_FEATURE_LAOC_SUPPORT=     y
   5  L2TP_FEATURE_LNIC_SUPPORT=     y
   6  L2TP_FEATURE_LNOC_SUPPORT=     y
   7 -L2TP_FEATURE_LOCAL_CONF_FILE=  y
   8 +#L2TP_FEATURE_LOCAL_CONF_FILE= y
   9  #L2TP_FEATURE_LOCAL_STAT_FILE= y
  10
  11  # Define USE_DMALLOC to enable dmalloc memory debugging
  12 @@ -29,31 +29,31 @@
  13  # Build for UML environment?
  14  # UML_TARGET=          y
  15
  16 -ARCH=$(shell uname -p)
  17 -ifeq ($(ARCH),x86_64)
  18 -SYS_LIBDIR=/usr/lib64
  19 -else
  20 +#ARCH=$(shell uname -p)
  21 +#ifeq ($(ARCH),x86_64)
  22 +#SYS_LIBDIR=/usr/lib64
  23 +#else
  24  SYS_LIBDIR=/usr/lib
  25 -endif
  26 +#endif
  27
  28  # Point to kernel source tree
  29 -KERNEL_SRCDIR=         /lib/modules/$(shell uname -r)/source
  30 -KERNEL_BLDDIR=         /lib/modules/$(shell uname -r)/build
  31 +#KERNEL_SRCDIR=                /lib/modules/$(shell uname -r)/source
  32 +#KERNEL_BLDDIR=                /lib/modules/$(shell uname -r)/build
  33
  34  # Points to pppd install.
  35  # By default, pppd headers are assumed to be in /usr/include/pppd. but
  36  # can be pointed to a local pppd source tree if desired.
  37 -PPPD_VERSION=          2.4.5
  38 +#PPPD_VERSION=         2.4.5
  39  # PPPD_SRCDIR=         /usr/local/src/ppp-2.4.5
  40  # PPPD_LIBDIR=         /usr/lib/pppd/2.4.5
  41
  42  # Points to readline install root. READLINE_DIR should have lib/ & include/ subdirs
  43  # If not defined, readline is assumed to be installed in the standard places that
  44  # the compiler looks.
  45 -READLINE_DIR=
  46 +#READLINE_DIR=
  47
  48  # For cross-compiling
  49 -CROSS_COMPILE=
  50 +#CROSS_COMPILE=
  51
  52  # END CONFIGURABLE SETTINGS
  53
  54 @@ -142,9 +142,9 @@
  55
  56  CPPFLAGS=              $(CPPFLAGS.l2tptest) $(CPPFLAGS-y)
  57  CFLAGS=                        -I. -Iusl -Icli -isystem $(KERNEL_BLDDIR)/include \
  58 -                               -isystem $(KERNEL_SRCDIR)/include -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
  59 +                               -isystem $(KERNEL_SRCDIR)/include -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
  60  LDFLAGS.l2tpd=         -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc
  61 -LDFLAGS.l2tpconfig=    -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
  62 +LDFLAGS.l2tpconfig=    -Lcli -lcli -lreadline -lncurses $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
  63
  64  OPT_CFLAGS?=           -O
  65
  66 --- orig/cli/Makefile   2008-02-03 19:55:30.000000000 +0500
  67 +++ new/cli/Makefile    2010-10-28 07:15:39.000000000 +0600
  68 @@ -7,7 +7,7 @@
  69
  70  LDFLAGS.cli_test=      -L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc
  71
  72 -CFLAGS=                        $(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS)
  73 +CFLAGS=                        $(CFLAGS.optimize) -MMD -Wall -I.. $(READLINE_CFLAGS)
  74
  75  .PHONY:                        all test clean
  76
  77 --- orig/usl/Makefile   2008-02-24 16:52:50.000000000 +0500
  78 +++ new/usl/Makefile    2010-10-28 07:15:39.000000000 +0600
  79 @@ -14,7 +14,7 @@
  80  endif
  81
  82  CPPFLAGS+=             $(CFLAGS.optimize) -g
  83 -CFLAGS=                        -I. -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc)
  84 +CFLAGS=                        -I. -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc)
  85
  86  .PHONY:                        all test clean
  87