mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
06403981e1
fcb076c Various fixes for errors found by coverity static analysis (#109) d98ab38 Merge branch 'pppd_print_changes' of https://github.com/nlhintz/ppp into nlhintz-pppd_print_changes Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
61 lines
2.1 KiB
Diff
61 lines
2.1 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
|
|
@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/
|
|
INSTALL = install
|
|
|
|
PLUGIN=radius.so radattr.so radrealms.so
|
|
-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
|
|
+COPTS = -O2
|
|
+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
|
|
|
|
# Uncomment the next line to include support for Microsoft's
|
|
# MS-CHAP authentication protocol.
|
|
@@ -43,13 +44,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/pppdump/Makefile.linux
|
|
+++ b/pppdump/Makefile.linux
|
|
@@ -2,7 +2,8 @@ DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
|
|
-CFLAGS= -O -I../include/net
|
|
+COPTS = -O
|
|
+CFLAGS= $(COPTS) -I../include/net
|
|
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
|
|
|
|
INSTALL= install
|
|
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
@@ -39,7 +39,7 @@ debug.o: debug.c
|
|
$(CC) $(CFLAGS) -I../../.. -c -o debug.o debug.c
|
|
|
|
rp-pppoe.so: plugin.o discovery.o if.o common.o
|
|
- $(CC) $(LDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
|
|
+ $(CC) $(LDFLAGS) -fPIC -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
|
|
|
|
install: all
|
|
$(INSTALL) -d -m 755 $(LIBDIR)
|