030bc39c35
Upstream integrated multiple patches from Distributions and did other changes: * rp-pppoe.so was renamed to pppoe.so * Converted to ANSI C The following patches were applied upstream: * 100-debian_ip-ip_option.patch * 101-debian_close_dev_ppp.patch * 103-debian_fix_link_pidfile.patch * 106-debian_stripMSdomain.patch * 107-debian_pppoatm_wildcard.patch * 110-debian_defaultroute.patch * 202-no_strip.patch Compilation with musl libc was fixed upstream so 140-pppoe_compile_fix.patch is not needed any more Parts of the 203-opt_flags.patch patch were applied in a different way upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
build: Move optimization flags into a separate variable
|
|
|
|
Isolate optimization related compiler flags from CFLAGS and move them into a
|
|
separate COPTS variable so that it is easier to override optimizations from
|
|
the environment.
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
|
|
|
|
--- a/pppd/plugins/radius/Makefile.linux
|
|
+++ b/pppd/plugins/radius/Makefile.linux
|
|
@@ -47,13 +47,13 @@ install: all
|
|
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
|
|
|
|
radius.so: radius.o libradiusclient.a
|
|
- $(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a
|
|
+ $(CC) $(LDFLAGS) -fPIC -o radius.so -shared radius.o libradiusclient.a
|
|
|
|
radattr.so: radattr.o
|
|
- $(CC) $(LDFLAGS) -o radattr.so -shared radattr.o
|
|
+ $(CC) $(LDFLAGS) -fPIC -o radattr.so -shared radattr.o
|
|
|
|
radrealms.so: radrealms.o
|
|
- $(CC) $(LDFLAGS) -o radrealms.so -shared radrealms.o
|
|
+ $(CC) $(LDFLAGS) -fPIC -o radrealms.so -shared radrealms.o
|
|
|
|
CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
|
|
clientid.o sendserver.o lock.o util.o md5.o
|
|
--- a/pppd/plugins/pppoe/Makefile.linux
|
|
+++ b/pppd/plugins/pppoe/Makefile.linux
|
|
@@ -38,7 +38,7 @@ debug.o: debug.c
|
|
$(CC) $(CFLAGS) -I../../.. -c -o debug.o debug.c
|
|
|
|
pppoe.so: plugin.o discovery.o if.o common.o
|
|
- $(CC) $(LDFLAGS) -o pppoe.so -shared plugin.o discovery.o if.o common.o
|
|
+ $(CC) $(LDFLAGS) -fPIC -o pppoe.so -shared plugin.o discovery.o if.o common.o
|
|
|
|
install: all
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|