From d729b06f0ac7a5ebd3648ef60bef0499b59bf82d Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Fri, 4 Apr 2014 11:29:39 +0200 Subject: [PATCH 03/27] build-sys: utilize compiler flags handed to us by rpmbuild --- chat/Makefile.linux | 2 +- pppd/Makefile.linux | 3 +-- pppd/plugins/Makefile.linux | 2 +- pppd/plugins/pppoatm/Makefile.linux | 2 +- pppd/plugins/radius/Makefile.linux | 2 +- pppd/plugins/rp-pppoe/Makefile.linux | 2 +- pppdump/Makefile.linux | 2 +- pppstats/Makefile.linux | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/chat/Makefile.linux b/chat/Makefile.linux index 1065ac5..848cd8d 100644 --- a/chat/Makefile.linux +++ b/chat/Makefile.linux @@ -10,7 +10,7 @@ CDEF3= -UNO_SLEEP # Use the usleep function CDEF4= -DFNDELAY=O_NDELAY # Old name value CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) -COPTS= -O2 -g -pipe +COPTS= $(RPM_OPT_FLAGS) CFLAGS= $(COPTS) $(CDEFS) INSTALL= install diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index 5a44d30..63872eb 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -32,8 +32,7 @@ endif CC = gcc # -COPTS = -O2 -pipe -Wall -g -LIBS = +COPTS = -Wall $(RPM_OPT_FLAGS) # Uncomment the next 2 lines to include support for Microsoft's # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux index 0a7ec7b..e09a369 100644 --- a/pppd/plugins/Makefile.linux +++ b/pppd/plugins/Makefile.linux @@ -1,5 +1,5 @@ #CC = gcc -COPTS = -O2 -g +COPTS = $(RPM_OPT_FLAGS) CFLAGS = $(COPTS) -I.. -I../../include -fPIC LDFLAGS = -shared INSTALL = install diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux index 20f62e6..5a81447 100644 --- a/pppd/plugins/pppoatm/Makefile.linux +++ b/pppd/plugins/pppoatm/Makefile.linux @@ -1,5 +1,5 @@ #CC = gcc -COPTS = -O2 -g +COPTS = $(RPM_OPT_FLAGS) CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC LDFLAGS = -shared INSTALL = install diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux index 24ed3e5..45b3b8d 100644 --- a/pppd/plugins/radius/Makefile.linux +++ b/pppd/plugins/radius/Makefile.linux @@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) INSTALL = install PLUGIN=radius.so radattr.so radrealms.so -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON +CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux index 5d7a271..352991a 100644 --- a/pppd/plugins/rp-pppoe/Makefile.linux +++ b/pppd/plugins/rp-pppoe/Makefile.linux @@ -25,7 +25,7 @@ INSTALL = install # Version is set ONLY IN THE MAKEFILE! Don't delete this! RP_VERSION=3.8p -COPTS=-O2 -g +COPTS=$(RPM_OPT_FLAGS) CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' all: rp-pppoe.so pppoe-discovery diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux index ac028f6..d0a5032 100644 --- a/pppdump/Makefile.linux +++ b/pppdump/Makefile.linux @@ -2,7 +2,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 -CFLAGS= -O -I../include/net +CFLAGS= $(RPM_OPT_FLAGS) -I../include/net OBJS = pppdump.o bsd-comp.o deflate.o zlib.o INSTALL= install diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux index cca6f0f..42aba73 100644 --- a/pppstats/Makefile.linux +++ b/pppstats/Makefile.linux @@ -10,7 +10,7 @@ PPPSTATSRCS = pppstats.c PPPSTATOBJS = pppstats.o #CC = gcc -COPTS = -O +COPTS = $(RPM_OPT_FLAGS) COMPILE_FLAGS = -I../include LIBS = -- 1.8.3.1