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