2020-05-30 01:47:35 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-05-25 22:12:56 +00:00
|
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
|
|
Date: Wed, 19 Apr 2017 06:10:01 -0500
|
|
|
|
|
Subject: [PATCH] RH: use rpm optflags if present
|
|
|
|
|
|
|
|
|
|
Use the passed in optflags when compiling as an RPM, and keep the
|
|
|
|
|
default flags as close as possible to the current fedora flags, while
|
|
|
|
|
still being generic.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
|
|
---
|
2022-07-13 21:51:42 +00:00
|
|
|
Makefile.inc | 24 ++++++++++++++++++------
|
|
|
|
|
1 file changed, 18 insertions(+), 6 deletions(-)
|
2017-05-25 22:12:56 +00:00
|
|
|
|
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
2022-08-19 17:48:04 +00:00
|
|
|
index 03450610..2cf6e85f 100644
|
2017-05-25 22:12:56 +00:00
|
|
|
--- a/Makefile.inc
|
|
|
|
|
+++ b/Makefile.inc
|
2022-08-19 17:48:04 +00:00
|
|
|
@@ -141,18 +141,30 @@ ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers
|
2020-05-30 01:47:35 +00:00
|
|
|
WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
|
2021-07-01 20:23:09 +00:00
|
|
|
WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,)
|
2020-07-09 04:16:57 +00:00
|
|
|
|
|
|
|
|
-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
|
2021-07-01 20:23:09 +00:00
|
|
|
-WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
|
2017-05-25 22:12:56 +00:00
|
|
|
+ifndef RPM_OPT_FLAGS
|
2022-07-13 21:51:42 +00:00
|
|
|
+ OPTFLAGS := -O2 -g -Wall $(FORTIFY_OPT) -fexceptions \
|
2020-07-09 04:16:57 +00:00
|
|
|
+ $(STACKPROT) -grecord-gcc-switches \
|
|
|
|
|
+ -fasynchronous-unwind-tables --param=ssp-buffer-size=4
|
2017-05-25 22:12:56 +00:00
|
|
|
+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1)
|
|
|
|
|
+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
|
|
|
|
|
+ endif
|
2020-05-30 01:47:35 +00:00
|
|
|
+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-annobin-cc1 && echo 1),1)
|
|
|
|
|
+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
|
|
|
|
|
+ endif
|
2017-07-21 21:47:42 +00:00
|
|
|
+else
|
2020-07-09 04:16:57 +00:00
|
|
|
+ OPTFLAGS := $(RPM_OPT_FLAGS) --param=ssp-buffer-size=4
|
2017-05-25 22:12:56 +00:00
|
|
|
+endif
|
2021-07-01 20:23:09 +00:00
|
|
|
+WARNFLAGS := -Werror -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
|
2020-07-09 04:16:57 +00:00
|
|
|
-Werror=implicit-function-declaration -Werror=format-security \
|
|
|
|
|
- $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
|
2022-07-13 21:51:42 +00:00
|
|
|
-CPPFLAGS := $(FORTIFY_OPT) \
|
|
|
|
|
- -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \
|
|
|
|
|
+ $(WNOCLOBBERED) -Werror=cast-qual \
|
|
|
|
|
+ $(ERROR_DISCARDED_QUALIFIERS) -Wstrict-prototypes
|
|
|
|
|
+CPPFLAGS := -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \
|
|
|
|
|
-DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
|
|
|
|
|
CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
|
2021-12-13 19:09:30 +00:00
|
|
|
BIN_CFLAGS = -fPIE -DPIE
|
|
|
|
|
LIB_CFLAGS = -fPIC
|
|
|
|
|
SHARED_FLAGS = -shared
|
|
|
|
|
-LDFLAGS := $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -Wl,-z,defs
|
|
|
|
|
+LDFLAGS := $(LDFLAGS) $(RPM_LD_FLAGS) -Wl,-z,relro -Wl,-z,now -Wl,-z,defs
|
|
|
|
|
BIN_LDFLAGS = -pie
|
|
|
|
|
|
|
|
|
|
# Check whether a function with name $1 has been declared in header file $2.
|
