Annotation of /trunk/ppp/patches/ppp-2.4.5-make-vars.patch
Parent Directory | Revision Log
Revision 1109 -
(hide annotations)
(download)
Fri Aug 20 11:00:23 2010 UTC (14 years, 1 month ago) by niro
File size: 6605 byte(s)
Fri Aug 20 11:00:23 2010 UTC (14 years, 1 month ago) by niro
File size: 6605 byte(s)
-re-diffed against ppp-2.4.5
1 | niro | 1109 | diff -Naur ppp-2.4.5/chat/Makefile.linux ppp-2.4.5-magellan/chat/Makefile.linux |
2 | --- ppp-2.4.5/chat/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
3 | +++ ppp-2.4.5-magellan/chat/Makefile.linux 2010-08-20 12:10:06.000000000 +0200 | ||
4 | @@ -10,7 +10,6 @@ | ||
5 | CDEF4= -DFNDELAY=O_NDELAY # Old name value | ||
6 | CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) | ||
7 | |||
8 | -COPTS= -O2 -g -pipe | ||
9 | CFLAGS= $(COPTS) $(CDEFS) | ||
10 | |||
11 | INSTALL= install | ||
12 | @@ -18,7 +17,7 @@ | ||
13 | all: chat | ||
14 | |||
15 | chat: chat.o | ||
16 | - $(CC) -o chat chat.o | ||
17 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ | ||
18 | |||
19 | chat.o: chat.c | ||
20 | $(CC) -c $(CFLAGS) -o chat.o chat.c | ||
21 | diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5-magellan/pppd/Makefile.linux | ||
22 | --- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
23 | +++ ppp-2.4.5-magellan/pppd/Makefile.linux 2010-08-20 12:10:30.000000000 +0200 | ||
24 | @@ -32,7 +32,7 @@ | ||
25 | |||
26 | # CC = gcc | ||
27 | # | ||
28 | -COPTS = -O2 -pipe -Wall -g | ||
29 | +COPTS = -Wall | ||
30 | LIBS = | ||
31 | |||
32 | # Uncomment the next 2 lines to include support for Microsoft's | ||
33 | diff -Naur ppp-2.4.5/pppd/plugins/Makefile.linux ppp-2.4.5-magellan/pppd/plugins/Makefile.linux | ||
34 | --- ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
35 | +++ ppp-2.4.5-magellan/pppd/plugins/Makefile.linux 2010-08-20 12:12:12.000000000 +0200 | ||
36 | @@ -1,7 +1,11 @@ | ||
37 | #CC = gcc | ||
38 | -COPTS = -O2 -g | ||
39 | CFLAGS = $(COPTS) -I.. -I../../include -fPIC | ||
40 | -LDFLAGS = -shared | ||
41 | +LDFLAGS_PROG := $(LDFLAGS) | ||
42 | +export LDFLAGS LDFLAGS_PROG | ||
43 | +LDFLAGS += -shared | ||
44 | +# need the following option, otherwise linking plugins might fail with undef errors (Gentoo bug 210837) | ||
45 | +LDFLAGS += -Wl,--allow-shlib-undefined | ||
46 | +LIBS = | ||
47 | INSTALL = install | ||
48 | |||
49 | DESTDIR = $(INSTROOT)@DESTDIR@ | ||
50 | @@ -23,7 +27,7 @@ | ||
51 | for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done | ||
52 | |||
53 | %.so: %.c | ||
54 | - $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ | ||
55 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) | ||
56 | |||
57 | VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) | ||
58 | |||
59 | diff -Naur ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.5-magellan/pppd/plugins/pppoatm/Makefile.linux | ||
60 | --- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
61 | +++ ppp-2.4.5-magellan/pppd/plugins/pppoatm/Makefile.linux 2010-08-20 12:13:01.000000000 +0200 | ||
62 | @@ -1,7 +1,5 @@ | ||
63 | #CC = gcc | ||
64 | -COPTS = -O2 -g | ||
65 | CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC | ||
66 | -LDFLAGS = -shared | ||
67 | INSTALL = install | ||
68 | |||
69 | #*********************************************************************** | ||
70 | @@ -33,7 +31,7 @@ | ||
71 | all: $(PLUGIN) | ||
72 | |||
73 | $(PLUGIN): $(PLUGIN_OBJS) | ||
74 | - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) | ||
75 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) | ||
76 | |||
77 | install: all | ||
78 | $(INSTALL) -d -m 755 $(LIBDIR) | ||
79 | diff -Naur ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.5-magellan/pppd/plugins/pppol2tp/Makefile.linux | ||
80 | --- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
81 | +++ ppp-2.4.5-magellan/pppd/plugins/pppol2tp/Makefile.linux 2010-08-20 12:22:31.000000000 +0200 | ||
82 | @@ -1,7 +1,5 @@ | ||
83 | #CC = gcc | ||
84 | -COPTS = -O2 -g | ||
85 | CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC | ||
86 | -LDFLAGS = -shared | ||
87 | INSTALL = install | ||
88 | |||
89 | #*********************************************************************** | ||
90 | @@ -16,7 +14,7 @@ | ||
91 | all: $(PLUGINS) | ||
92 | |||
93 | %.so: %.o | ||
94 | - $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) | ||
95 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) | ||
96 | |||
97 | install: all | ||
98 | $(INSTALL) -d -m 755 $(LIBDIR) | ||
99 | diff -Naur ppp-2.4.5/pppd/plugins/radius/Makefile.linux ppp-2.4.5-magellan/pppd/plugins/radius/Makefile.linux | ||
100 | --- ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
101 | +++ ppp-2.4.5-magellan/pppd/plugins/radius/Makefile.linux 2010-08-20 12:15:41.000000000 +0200 | ||
102 | @@ -12,7 +12,7 @@ | ||
103 | INSTALL = install | ||
104 | |||
105 | PLUGIN=radius.so radattr.so radrealms.so | ||
106 | -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON | ||
107 | +CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON | ||
108 | |||
109 | # Uncomment the next line to include support for Microsoft's | ||
110 | # MS-CHAP authentication protocol. | ||
111 | @@ -43,13 +43,13 @@ | ||
112 | $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) | ||
113 | |||
114 | radius.so: radius.o libradiusclient.a | ||
115 | - $(CC) -o radius.so -shared radius.o libradiusclient.a | ||
116 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ | ||
117 | |||
118 | radattr.so: radattr.o | ||
119 | - $(CC) -o radattr.so -shared radattr.o | ||
120 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ | ||
121 | |||
122 | radrealms.so: radrealms.o | ||
123 | - $(CC) -o radrealms.so -shared radrealms.o | ||
124 | + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ | ||
125 | |||
126 | CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ | ||
127 | clientid.o sendserver.o lock.o util.o md5.o | ||
128 | @@ -63,3 +63,4 @@ | ||
129 | rm -f *.o *.so *.a | ||
130 | |||
131 | dist-clean: distclean | ||
132 | + | ||
133 | diff -Naur ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5-magellan/pppd/plugins/rp-pppoe/Makefile.linux | ||
134 | --- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
135 | +++ ppp-2.4.5-magellan/pppd/plugins/rp-pppoe/Makefile.linux 2010-08-20 12:24:38.000000000 +0200 | ||
136 | @@ -30,7 +30,7 @@ | ||
137 | all: rp-pppoe.so pppoe-discovery | ||
138 | |||
139 | pppoe-discovery: pppoe-discovery.o debug.o | ||
140 | - $(CC) -o pppoe-discovery pppoe-discovery.o debug.o | ||
141 | + $(CC) $(LDFLAGS_PROG) $(CFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o | ||
142 | |||
143 | pppoe-discovery.o: pppoe-discovery.c | ||
144 | $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c | ||
145 | @@ -39,7 +39,7 @@ | ||
146 | $(CC) $(CFLAGS) -c -o debug.o debug.c | ||
147 | |||
148 | rp-pppoe.so: plugin.o discovery.o if.o common.o | ||
149 | - $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o | ||
150 | + $(CC) $(LDFLAGS) $(CFLAGS) -o rp-pppoe.so plugin.o discovery.o if.o common.o | ||
151 | |||
152 | install: all | ||
153 | $(INSTALL) -d -m 755 $(LIBDIR) | ||
154 | diff -Naur ppp-2.4.5/pppdump/Makefile.linux ppp-2.4.5-magellan/pppdump/Makefile.linux | ||
155 | --- ppp-2.4.5/pppdump/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
156 | +++ ppp-2.4.5-magellan/pppdump/Makefile.linux 2010-08-20 12:18:50.000000000 +0200 | ||
157 | @@ -2,7 +2,7 @@ | ||
158 | BINDIR = $(DESTDIR)/sbin | ||
159 | MANDIR = $(DESTDIR)/share/man/man8 | ||
160 | |||
161 | -CFLAGS= -O -I../include/net | ||
162 | +CFLAGS=$(COPTS) -I../include/net | ||
163 | OBJS = pppdump.o bsd-comp.o deflate.o zlib.o | ||
164 | |||
165 | INSTALL= install | ||
166 | @@ -10,7 +10,7 @@ | ||
167 | all: pppdump | ||
168 | |||
169 | pppdump: $(OBJS) | ||
170 | - $(CC) -o pppdump $(OBJS) | ||
171 | + $(CC) $(LDFLAGS)-o pppdump $(OBJS) | ||
172 | |||
173 | clean: | ||
174 | rm -f pppdump $(OBJS) *~ | ||
175 | diff -Naur ppp-2.4.5/pppstats/Makefile.linux ppp-2.4.5-magellan/pppstats/Makefile.linux | ||
176 | --- ppp-2.4.5/pppstats/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 | ||
177 | +++ ppp-2.4.5-magellan/pppstats/Makefile.linux 2010-08-20 12:19:25.000000000 +0200 | ||
178 | @@ -10,7 +10,6 @@ | ||
179 | PPPSTATOBJS = pppstats.o | ||
180 | |||
181 | #CC = gcc | ||
182 | -COPTS = -O | ||
183 | COMPILE_FLAGS = -I../include | ||
184 | LIBS = | ||
185 | |||
186 | @@ -26,7 +25,7 @@ | ||
187 | $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) | ||
188 | |||
189 | pppstats: $(PPPSTATSRCS) | ||
190 | - $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) | ||
191 | + $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS) | ||
192 | |||
193 | clean: | ||
194 | rm -f pppstats *~ #* core |