fix(coreos-base/cros_boot_mode): Fix building with GCC 4.6

Swap -fstack-protector-strong for -fstack-protector-all
This commit is contained in:
Michael Marineau 2013-07-17 18:51:29 -04:00
parent 0d4311f53c
commit d9cdb511a3
2 changed files with 15 additions and 1 deletions

View File

@ -7,7 +7,7 @@ CROS_WORKON_TREE="b21faacf6a9940571ef122363c19a1ac02595b4b"
CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode"
CROS_WORKON_OUTOFTREE_BUILD=1
inherit toolchain-funcs cros-debug cros-workon
inherit eutils toolchain-funcs cros-debug cros-workon
DESCRIPTION="Chrome OS platform boot mode utility"
HOMEPAGE="http://www.chromium.org/"
@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
src_prepare() {
cros-workon_src_prepare
epatch "${FILESDIR}/${P}-fix-fstack-protector.patch"
}
src_configure() {

View File

@ -0,0 +1,13 @@
diff --git a/common.mk b/common.mk
index 357d1f9..9a91c43 100644
--- a/common.mk
+++ b/common.mk
@@ -260,7 +260,7 @@ endif
# CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list
# CXXFLAGS := $(filter-out badflag,$(CXXFLAGS)) # Filter out a value
# The same goes for CFLAGS.
-COMMON_CFLAGS := -Wall -Werror -fstack-protector-strong -fno-strict-aliasing \
+COMMON_CFLAGS := -Wall -Werror -fstack-protector-all -fno-strict-aliasing \
-ggdb3 -Wa,--noexecstack -O1 -fvisibility=internal -Wformat=2
CXXFLAGS += $(COMMON_CFLAGS)
CFLAGS += $(COMMON_CFLAGS)