Merge pull request #821 from marineam/gcc

GCC 4.7 build fixes

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild

@@ -106,7 +106,6 @@ RDEPEND="${RDEPEND}
 	app-arch/unzip
 	app-arch/zip
 	app-shells/bash
-	coreos-base/cros_boot_mode
 	coreos-base/vboot_reference
 	coreos-base/update_engine
 	coreos-base/coreos-init

sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild

@@ -1,66 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="a3df396f95e6f5f91adaafb2d25c981bd6c650ef"
-CROS_WORKON_TREE="b21faacf6a9940571ef122363c19a1ac02595b4b"
-CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode"
-CROS_WORKON_OUTOFTREE_BUILD=1
-
-inherit eutils toolchain-funcs cros-debug cros-workon
-
-DESCRIPTION="Chrome OS platform boot mode utility"
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test valgrind"
-
-LIBCHROME_VERS="125070"
-
-RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )"
-
-# qemu use isn't reflected as it is copied into the target
-# from the build host environment.
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gmock )
-	test? ( dev-cpp/gtest )
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	cros-workon_src_prepare
-    epatch "${FILESDIR}/${P}-fix-fstack-protector.patch"
-}
-
-src_configure() {
-	cros-workon_src_configure
-}
-
-src_compile() {
-	cros-workon_src_compile
-}
-
-src_test() {
-	# Needed for `cros_run_unit_tests`.
-	cros-workon_src_test
-}
-
-src_install() {
-	into /
-	dobin "${OUT}"/cros_boot_mode
-
-	into /usr
-	dolib.so "${OUT}"/libcros_boot_mode.so
-
-	insinto /usr/include/cros_boot_mode
-	doins \
-		active_main_firmware.h \
-		bootloader_type.h \
-		boot_mode.h \
-		developer_switch.h \
-		helpers.h \
-		platform_reader.h \
-		platform_switch.h
-}

sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-9999.ebuild

@@ -1,63 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode"
-CROS_WORKON_OUTOFTREE_BUILD=1
-
-inherit toolchain-funcs cros-debug cros-workon
-
-DESCRIPTION="Chrome OS platform boot mode utility"
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test valgrind"
-
-LIBCHROME_VERS="125070"
-
-RDEPEND="test? ( chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] )"
-
-# qemu use isn't reflected as it is copied into the target
-# from the build host environment.
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gmock )
-	test? ( dev-cpp/gtest )
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	cros-workon_src_prepare
-}
-
-src_configure() {
-	cros-workon_src_configure
-}
-
-src_compile() {
-	cros-workon_src_compile
-}
-
-src_test() {
-	# Needed for `cros_run_unit_tests`.
-	cros-workon_src_test
-}
-
-src_install() {
-	into /
-	dobin "${OUT}"/cros_boot_mode
-
-	into /usr
-	dolib.so "${OUT}"/libcros_boot_mode.so
-
-	insinto /usr/include/cros_boot_mode
-	doins \
-		active_main_firmware.h \
-		bootloader_type.h \
-		boot_mode.h \
-		developer_switch.h \
-		helpers.h \
-		platform_reader.h \
-		platform_switch.h
-}

sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch

@@ -1,13 +0,0 @@
-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)

sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild

@@ -9,7 +9,7 @@ CROS_WORKON_LOCALDIR="src/platform"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="1b63aaac25e915291b504eb1c477d4d56211bf4f"
+	CROS_WORKON_COMMIT="0d0752d3e7fcb63f8d6e9bffde21500dec6872ac"
 	KEYWORDS="amd64 arm x86"
 fi