You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.5 KiB
56 lines
2.5 KiB
4 months ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
Makefile.inc | 22 +++++++++++++++++-----
|
||
|
|
1 file changed, 17 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
||
|
|
index 33dbb99c..94e0ec85 100644
|
||
|
|
--- a/Makefile.inc
|
||
|
|
+++ b/Makefile.inc
|
||
|
|
@@ -95,11 +95,23 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
|
||
|
|
MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
|
||
|
|
echo "modprobe@dm_multipath.service")
|
||
|
|
|
||
|
|
-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
|
||
|
|
-WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
|
||
|
|
+ifndef RPM_OPT_FLAGS
|
||
|
|
+ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 \
|
||
|
|
+ -Wall $(FORTIFY_OPT) -fexceptions -grecord-gcc-switches \
|
||
|
|
+ -fasynchronous-unwind-tables
|
||
|
|
+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1)
|
||
|
|
+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
|
||
|
|
+ endif
|
||
|
|
+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-annobin-cc1 && echo 1),1)
|
||
|
|
+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1
|
||
|
|
+ endif
|
||
|
|
+else
|
||
|
|
+ OPTFLAGS := $(RPM_OPT_FLAGS) --param=ssp-buffer-size=4
|
||
|
|
+endif
|
||
|
|
+WARNFLAGS := -Werror -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
|
||
|
|
-Werror=implicit-function-declaration -Werror=format-security \
|
||
|
|
- $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
|
||
|
|
-CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
|
||
|
|
+ $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) -Wstrict-prototypes
|
||
|
|
+CPPFLAGS := $(CPPFLAGS) $(D_URCU_VERSION) \
|
||
|
|
-D_FILE_OFFSET_BITS=64 \
|
||
|
|
-DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(TGTDIR)$(plugindir)\" \
|
||
|
|
-DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
|
||
|
|
@@ -109,7 +121,7 @@ CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
|
||
|
|
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
|
||
|
|
|
||
|
|
# Source code directories. Don't modify.
|