net/openl2tp/patches/001-makefile.patch

   1 Index: openl2tp-1.7/Makefile
   2 ===================================================================
   3 --- openl2tp-1.7.orig/Makefile  2010-03-18 10:04:47.000000000 +0100
   4 +++ openl2tp-1.7/Makefile       2010-11-01 18:25:19.785000816 +0100
   5 @@ -8,7 +8,7 @@
   6  L2TP_FEATURE_LAOC_SUPPORT=     y
   7  L2TP_FEATURE_LNIC_SUPPORT=     y
   8  L2TP_FEATURE_LNOC_SUPPORT=     y
   9 -L2TP_FEATURE_LOCAL_CONF_FILE=  y
  10 +#L2TP_FEATURE_LOCAL_CONF_FILE= y
  11  #L2TP_FEATURE_LOCAL_STAT_FILE= y
  12
  13  # Define USE_DMALLOC to enable dmalloc memory debugging
  14 @@ -29,31 +29,31 @@
  15  # Build for UML environment?
  16  # UML_TARGET=          y
  17
  18 -ARCH=$(shell uname -p)
  19 -ifeq ($(ARCH),x86_64)
  20 -SYS_LIBDIR=/usr/lib64
  21 -else
  22 +#ARCH=$(shell uname -p)
  23 +#ifeq ($(ARCH),x86_64)
  24 +#SYS_LIBDIR=/usr/lib64
  25 +#else
  26  SYS_LIBDIR=/usr/lib
  27 -endif
  28 +#endif
  29
  30  # Point to kernel source tree
  31 -KERNEL_SRCDIR=         /lib/modules/$(shell uname -r)/source
  32 -KERNEL_BLDDIR=         /lib/modules/$(shell uname -r)/build
  33 +#KERNEL_SRCDIR=                /lib/modules/$(shell uname -r)/source
  34 +#KERNEL_BLDDIR=                /lib/modules/$(shell uname -r)/build
  35
  36  # Points to pppd install.
  37  # By default, pppd headers are assumed to be in /usr/include/pppd. but
  38  # can be pointed to a local pppd source tree if desired.
  39 -PPPD_VERSION=          2.4.5
  40 +#PPPD_VERSION=         2.4.5
  41  # PPPD_SRCDIR=         /usr/local/src/ppp-2.4.5
  42  # PPPD_LIBDIR=         /usr/lib/pppd/2.4.5
  43
  44  # Points to readline install root. READLINE_DIR should have lib/ & include/ subdirs
  45  # If not defined, readline is assumed to be installed in the standard places that
  46  # the compiler looks.
  47 -READLINE_DIR=
  48 +#READLINE_DIR=
  49
  50  # For cross-compiling
  51 -CROSS_COMPILE=
  52 +#CROSS_COMPILE=
  53
  54  # END CONFIGURABLE SETTINGS
  55
  56 @@ -142,9 +142,9 @@
  57
  58  CPPFLAGS=              $(CPPFLAGS.l2tptest) $(CPPFLAGS-y)
  59  CFLAGS=                        -I. -Iusl -Icli -isystem $(KERNEL_BLDDIR)/include \
  60 -                               -isystem $(KERNEL_SRCDIR)/include -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
  61 +                               -isystem $(KERNEL_SRCDIR)/include -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc) -DSYS_LIBDIR=$(SYS_LIBDIR)
  62  LDFLAGS.l2tpd=         -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc
  63 -LDFLAGS.l2tpconfig=    -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
  64 +LDFLAGS.l2tpconfig=    -Lcli -lcli -lreadline -lncurses $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc
  65
  66  OPT_CFLAGS?=           -O
  67
  68 @@ -171,7 +171,7 @@
  69
  70  .PHONY:                        all clean distclean install daemon app test check
  71
  72 -all:                   check generated-files daemon $(APP)
  73 +all:                   check daemon $(APP)
  74
  75  check:
  76                         @if [ ! -f $(KERNEL_SRCDIR)/include/linux/if_pppol2tp.h ]; then \
  77 @@ -179,9 +179,9 @@
  78                                 false ;\
  79                         fi
  80
  81 -daemon:                        generated-files $(SUBDIRS:%=subdir-%) openl2tpd
  82 +daemon:                        $(SUBDIRS:%=subdir-%) openl2tpd
  83
  84 -app:                   generated-files l2tpconfig
  85 +app:                   l2tpconfig
  86
  87  test:                  subdir-test
  88                         $(MAKE) -C $@ $(MFLAGS) $@
  89 @@ -189,7 +189,7 @@
  90
  91  .PHONY:                        $(SUBDIRS:%=subdir-%)
  92
  93 -$(SUBDIRS:%=subdir-%): FORCE
  94 +$(SUBDIRS:%=subdir-%): FORCE generated-files
  95                         $(MAKE) -C $(@:subdir-%=%) $(MFLAGS) EXTRA_CFLAGS="$(CPPFLAGS)"
  96
  97  ifeq ($(L2TP_FEATURE_LOCAL_CONF_FILE),y)
  98 @@ -257,9 +257,13 @@
  99                         @for d in $(SUBDIRS); do $(MAKE) -C $$d $(MFLAGS) $@; done
 100                         etags $(wildcard *.c) $(wildcard *.h)
 101
 102 +$(L2TPD_SRCS.o):       generated-files
 103 +
 104  openl2tpd:             $(L2TPD_SRCS.o)
 105                         $(CC) -o $@ $^ $(LDFLAGS.l2tpd)
 106
 107 +$(L2TPCONFIG_SRCS.o):  generated-files
 108 +
 109  l2tpconfig:            $(L2TPCONFIG_SRCS.o)
 110                         $(CC) -o $@ $^ $(LDFLAGS.l2tpconfig)
 111
 112 @@ -309,6 +313,7 @@
 113         else \
 114                 mv $@.tmp $@ ;\
 115         fi
 116 +       @echo '$@ generated.'
 117
 118  .PHONY:                        all install-all install-daemon install-app
 119
 120 Index: openl2tp-1.7/cli/Makefile
 121 ===================================================================
 122 --- openl2tp-1.7.orig/cli/Makefile      2008-02-03 15:55:30.000000000 +0100
 123 +++ openl2tp-1.7/cli/Makefile   2010-11-01 18:06:06.945000001 +0100
 124 @@ -7,7 +7,7 @@
 125
 126  LDFLAGS.cli_test=      -L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc
 127
 128 -CFLAGS=                        $(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS)
 129 +CFLAGS=                        $(CFLAGS.optimize) -MMD -Wall -I.. $(READLINE_CFLAGS)
 130
 131  .PHONY:                        all test clean
 132
 133 Index: openl2tp-1.7/usl/Makefile
 134 ===================================================================
 135 --- openl2tp-1.7.orig/usl/Makefile      2008-02-24 12:52:50.000000000 +0100
 136 +++ openl2tp-1.7/usl/Makefile   2010-11-01 18:06:06.945000001 +0100
 137 @@ -14,7 +14,7 @@
 138  endif
 139
 140  CPPFLAGS+=             $(CFLAGS.optimize) -g
 141 -CFLAGS=                        -I. -MMD -Wall -Werror $(CPPFLAGS) $(CPPFLAGS.dmalloc)
 142 +CFLAGS=                        -I. -MMD -Wall $(CPPFLAGS) $(CPPFLAGS.dmalloc)
 143
 144  .PHONY:                        all test clean
 145