1*4882a593SmuzhiyunFrom 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Changqing Li <changqing.li@windriver.com> 3*4882a593SmuzhiyunDate: Mon, 26 Nov 2018 09:19:17 +0800 4*4882a593SmuzhiyunSubject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 5*4882a593Smuzhiyun17 6*4882a593Smuzhiyun 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 7*4882a593Smuzhiyun19 8*4882a593Smuzhiyun Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if 9*4882a593Smuzhiyunpresent 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUse the passed in optflags when compiling as an RPM, and keep the 12*4882a593Smuzhiyundefault flags as close as possible to the current fedora flags, while 13*4882a593Smuzhiyunstill being generic. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Benjamin Marzinski <bmarzins@redhat.com> 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunUpstream-Status: Pending 18*4882a593Smuzhiyun 19*4882a593Smuzhiyunupdate this patch to new version 20*4882a593Smuzhiyun 21*4882a593SmuzhiyunSigned-off-by: Changqing Li <changqing.li@windriver.com> 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun Makefile.inc | 24 ++++++++++++++++-------- 24*4882a593Smuzhiyun 1 file changed, 16 insertions(+), 8 deletions(-) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyundiff --git a/Makefile.inc b/Makefile.inc 27*4882a593Smuzhiyunindex 42dbb5bf..55a06c60 100644 28*4882a593Smuzhiyun--- a/Makefile.inc 29*4882a593Smuzhiyun+++ b/Makefile.inc 30*4882a593Smuzhiyun@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \ 31*4882a593Smuzhiyun echo "$(2)"; \ 32*4882a593Smuzhiyun fi) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun-STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 35*4882a593Smuzhiyun-ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) 36*4882a593Smuzhiyun-WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,) 37*4882a593Smuzhiyun+ifndef RPM_OPT_FLAGS 38*4882a593Smuzhiyun+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) 39*4882a593Smuzhiyun+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ 40*4882a593Smuzhiyun+ -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \ 41*4882a593Smuzhiyun+ $(STACKPROT) --param=ssp-buffer-size=4 \ 42*4882a593Smuzhiyun+ -grecord-gcc-switches 43*4882a593Smuzhiyun+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1) 44*4882a593Smuzhiyun+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 45*4882a593Smuzhiyun+ endif 46*4882a593Smuzhiyun+else 47*4882a593Smuzhiyun+ OPTFLAGS = $(RPM_OPT_FLAGS) 48*4882a593Smuzhiyun+endif 49*4882a593Smuzhiyun+OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \ 50*4882a593Smuzhiyun+ -Werror=implicit-function-declaration -Wno-sign-compare \ 51*4882a593Smuzhiyun+ -Wno-unused-parameter -Werror=cast-qual \ 52*4882a593Smuzhiyun+ -Werror=discarded-qualifiers 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun-OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \ 55*4882a593Smuzhiyun- -Werror=implicit-function-declaration -Werror=format-security \ 56*4882a593Smuzhiyun- $(WNOCLOBBERED) \ 57*4882a593Smuzhiyun- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ 58*4882a593Smuzhiyun- $(STACKPROT) --param=ssp-buffer-size=4 59*4882a593Smuzhiyun CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 60*4882a593Smuzhiyun CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ 61*4882a593Smuzhiyun -MMD -MP $(CFLAGS) 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun2.17.1 64*4882a593Smuzhiyun 65