mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 09:31:53 +02:00
097635b79b
- sstrip cleanup from mjn3 - various patches from nico and others: http://openwrt.org/forum/viewtopic.php?t=368 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@145 3c298f89-4303-0410-b956-a3cf2f4a3e73
226 lines
6.9 KiB
Diff
226 lines
6.9 KiB
Diff
diff -ruN ppp-2.4.2-old/chat/Makefile.linux ppp-2.4.2-new/chat/Makefile.linux
|
|
--- ppp-2.4.2-old/chat/Makefile.linux 2004-01-13 04:57:55.000000000 +0100
|
|
+++ ppp-2.4.2-new/chat/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -6,8 +6,9 @@
|
|
CDEF4= -DFNDELAY=O_NDELAY # Old name value
|
|
CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
|
|
|
|
-COPTS= -O2 -g -pipe $(CDEFS)
|
|
-CFLAGS= $(COPTS) $(CDEFS)
|
|
+COPTS = -O2
|
|
+COMPILE_FLAGS = $(CDEFS)
|
|
+CFLAGS = $(COPTS) $(COMPILE_FLAGS)
|
|
|
|
INSTALL= install
|
|
|
|
diff -ruN ppp-2.4.2-old/pppd/Makefile.linux ppp-2.4.2-new/pppd/Makefile.linux
|
|
--- ppp-2.4.2-old/pppd/Makefile.linux 2003-11-27 22:55:19.000000000 +0100
|
|
+++ ppp-2.4.2-new/pppd/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -47,19 +47,19 @@
|
|
# Uncomment the next line to include support for PPP packet filtering.
|
|
# This requires that the libpcap library and headers be installed
|
|
# and that the kernel driver support PPP packet filtering.
|
|
-FILTER=y
|
|
+#FILTER=y
|
|
|
|
# Uncomment the next line to enable multilink PPP (enabled by default)
|
|
# Linux distributions: Please leave multilink ENABLED in your builds
|
|
# of pppd!
|
|
-HAVE_MULTILINK=y
|
|
+#HAVE_MULTILINK=y
|
|
|
|
# Uncomment the next line to enable the TDB database (enabled by default.)
|
|
# If you enable multilink, then TDB is automatically enabled also.
|
|
# Linux distributions: Please leave TDB ENABLED in your builds.
|
|
-USE_TDB=y
|
|
+#USE_TDB=y
|
|
|
|
-HAS_SHADOW=y
|
|
+#HAS_SHADOW=y
|
|
#USE_PAM=y
|
|
#HAVE_INET6=y
|
|
|
|
@@ -76,7 +76,7 @@
|
|
|
|
INCLUDE_DIRS= -I../include
|
|
|
|
-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
|
|
+COMPILE_FLAGS= -DHAVE_PATHS_H
|
|
|
|
CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS)
|
|
|
|
@@ -192,7 +192,7 @@
|
|
CFLAGS += -DMAXOCTETS
|
|
endif
|
|
|
|
-INSTALL= install -o root
|
|
+INSTALL= install
|
|
|
|
all: $(TARGETS)
|
|
|
|
diff -ruN ppp-2.4.2-old/pppd/plugins/Makefile.linux ppp-2.4.2-new/pppd/plugins/Makefile.linux
|
|
--- ppp-2.4.2-old/pppd/plugins/Makefile.linux 2004-01-13 04:56:24.000000000 +0100
|
|
+++ ppp-2.4.2-new/pppd/plugins/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -1,12 +1,16 @@
|
|
-CC = gcc
|
|
-COPTS = -O2 -g
|
|
-CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
-LDFLAGS = -shared
|
|
-INSTALL = install -o root
|
|
+#CC = gcc
|
|
+COPTS = -O2
|
|
+COMPILE_FLAGS = -I.. -I../../include -fPIC
|
|
+LIBS =
|
|
+
|
|
+INSTALL = install
|
|
+
|
|
+CFLAGS = $(COPTS) $(COMPILE_FLAGS)
|
|
+LDFLAGS = -shared
|
|
|
|
SUBDIRS := rp-pppoe
|
|
# Uncomment the next line to include the radius authentication plugin
|
|
-# SUBDIRS += radius
|
|
+SUBDIRS += radius
|
|
PLUGINS := minconn.so passprompt.so passwordfd.so
|
|
|
|
# include dependencies if present
|
|
diff -ruN ppp-2.4.2-old/pppd/plugins/radius/Makefile.linux ppp-2.4.2-new/pppd/plugins/radius/Makefile.linux
|
|
--- ppp-2.4.2-old/pppd/plugins/radius/Makefile.linux 2002-11-09 12:24:42.000000000 +0100
|
|
+++ ppp-2.4.2-new/pppd/plugins/radius/Makefile.linux 2004-08-23 12:57:38.000000000 +0200
|
|
@@ -5,7 +5,12 @@
|
|
|
|
MANDIR=/usr/man
|
|
PLUGIN=radius.so radattr.so radrealms.so
|
|
-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
|
|
+COPTS = -O2
|
|
+COMPILE_FLAGS = -I../.. -I../../../include -Iradiusclient/include -fPIC
|
|
+LIBS=
|
|
+
|
|
+CFLAGS=$(COPTS) $(COMPILE_FLAGS)
|
|
+LDFLAGS=-lradiusclient
|
|
|
|
# Uncomment the next line to include support for Microsoft's
|
|
# MS-CHAP authentication protocol.
|
|
@@ -37,29 +42,34 @@
|
|
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
|
|
|
|
radius.so: radiusclient/lib/.libs/libradiusclient.a radius.o
|
|
- gcc -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a
|
|
+ $(CC) -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a
|
|
|
|
radattr.so: radattr.o
|
|
- gcc -o radattr.so -shared radattr.o
|
|
+ $(CC) -o radattr.so -shared radattr.o
|
|
|
|
radrealms.so: radrealms.o
|
|
- gcc -o radrealms.so -shared radrealms.o
|
|
+ $(CC) -o radrealms.so -shared radrealms.o
|
|
|
|
radius.o: radius.c
|
|
- gcc $(CFLAGS) -c -o radius.o -fPIC radius.c
|
|
+ $(CC) -c $(CFLAGS) radius.c -o radius.o
|
|
|
|
radattr.o: radattr.c
|
|
- gcc $(CFLAGS) -c -o radattr.o -fPIC radattr.c
|
|
+ $(CC) -c $(CFLAGS) radattr.c -o radattr.o
|
|
|
|
radrealms.o: radrealms.c
|
|
- gcc $(CFLAGS) -c -o radrealms.o -fPIC radrealms.c
|
|
+ $(CC) -c $(CFLAGS) radrealms.c -o radrealms.o
|
|
|
|
radiusclient/lib/.libs/libradiusclient.a:
|
|
test -r radiusclient/Makefile || \
|
|
(cd radiusclient; \
|
|
+ rm -f config.cache ; \
|
|
+ aclocal ; \
|
|
+ autoconf ; \
|
|
+ ac_cv_func_setvbuf_reversed=no \
|
|
+ ac_cv_func_uname=no \
|
|
./configure --prefix=/usr \
|
|
--sysconfdir=/etc \
|
|
- --enable-shared \
|
|
+ --disable-shared \
|
|
--enable-static)
|
|
$(MAKE) -C radiusclient
|
|
|
|
diff -ruN ppp-2.4.2-old/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.2-new/pppd/plugins/rp-pppoe/Makefile.linux
|
|
--- ppp-2.4.2-old/pppd/plugins/rp-pppoe/Makefile.linux 2004-01-13 04:57:55.000000000 +0100
|
|
+++ ppp-2.4.2-new/pppd/plugins/rp-pppoe/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -16,12 +16,16 @@
|
|
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
|
|
VERSION=3.3
|
|
|
|
-COPTS=-O2 -g
|
|
-CFLAGS=$(COPTS) -I../../../include/linux
|
|
+#CC = gcc
|
|
+COPTS = -O2
|
|
+COMPILE_FLAGS = -I../../../include/linux -fPIC
|
|
+
|
|
+CFLAGS = $(COPTS) $(COMPILE_FLAGS)
|
|
+
|
|
all: rp-pppoe.so
|
|
|
|
rp-pppoe.so: libplugin.a plugin.o
|
|
- gcc -o rp-pppoe.so -shared plugin.o libplugin.a
|
|
+ $(CC) -o rp-pppoe.so -shared plugin.o libplugin.a
|
|
|
|
install: all
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
|
@@ -31,20 +35,20 @@
|
|
rm -f *.o *.so
|
|
|
|
plugin.o: plugin.c
|
|
- gcc '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c
|
|
+ $(CC) -c $(CFLAGS) plugin.c '-DRP_VERSION="$(VERSION)"' -I../../.. -o plugin.o
|
|
|
|
libplugin.a: discovery.o if.o common.o debug.o
|
|
- ar -rc $@ $^
|
|
+ $(AR) -rc $@ $^
|
|
|
|
discovery.o: discovery.c
|
|
- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c
|
|
+ $(CC) -c $(CFLAGS) discovery.c '-DVERSION="$(VERSION)"' -o discovery.o
|
|
|
|
if.o: if.c
|
|
- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o if.o -fPIC if.c
|
|
+ $(CC) -c $(CFLAGS) if.c '-DVERSION="$(VERSION)"' -o if.o
|
|
|
|
debug.o: debug.c
|
|
- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o -fPIC debug.c
|
|
+ $(CC) -c $(CFLAGS) debug.c '-DVERSION="$(VERSION)"' -o debug.o
|
|
|
|
common.o: common.c
|
|
- gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o common.o -fPIC common.c
|
|
+ $(CC) -c $(CFLAGS) common.c '-DVERSION="$(VERSION)"' -o common.o
|
|
|
|
diff -ruN ppp-2.4.2-old/pppdump/Makefile.linux ppp-2.4.2-new/pppdump/Makefile.linux
|
|
--- ppp-2.4.2-old/pppdump/Makefile.linux 1999-07-26 13:09:29.000000000 +0200
|
|
+++ ppp-2.4.2-new/pppdump/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -1,4 +1,8 @@
|
|
-CFLAGS= -O -I../include/net
|
|
+#CC = gcc
|
|
+COPTS = -O
|
|
+COMPILE_FLAGS = -I../include/net
|
|
+CFLAGS= $(COPTS) $(COMPILE_FLAGS)
|
|
+
|
|
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
|
|
|
|
INSTALL= install
|
|
diff -ruN ppp-2.4.2-old/pppstats/Makefile.linux ppp-2.4.2-new/pppstats/Makefile.linux
|
|
--- ppp-2.4.2-old/pppstats/Makefile.linux 2002-11-09 12:24:43.000000000 +0100
|
|
+++ ppp-2.4.2-new/pppstats/Makefile.linux 2004-08-23 12:48:50.000000000 +0200
|
|
@@ -7,11 +7,11 @@
|
|
PPPSTATOBJS = pppstats.o
|
|
|
|
#CC = gcc
|
|
-COPTS = -O
|
|
+COPTS = -O2
|
|
COMPILE_FLAGS = -I../include
|
|
LIBS =
|
|
|
|
-INSTALL= install -o root -g daemon
|
|
+INSTALL= install
|
|
|
|
CFLAGS = $(COPTS) $(COMPILE_FLAGS)
|
|
|