From 5acaa8fce274f4c59b9256b4950ab09af4d39f0c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 9 Dec 2014 21:30:33 -0800 Subject: [PATCH] libchrome+update_engine: fix build with GCC 4.8 A new warning is triggering build failures since -Werror is used. --- ...libchrome-180609-r3.ebuild => libchrome-180609-r4.ebuild} | 0 .../coreos-base/libchrome/libchrome-180609.ebuild | 5 +++++ ...ine-0.0.1-r410.ebuild => update_engine-0.0.1-r411.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 5 +++++ 4 files changed, 10 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/{libchrome-180609-r3.ebuild => libchrome-180609-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r410.ebuild => update_engine-0.0.1-r411.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild index a193893dec..8dff1d9602 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild @@ -50,6 +50,11 @@ src_configure() { cros-debug-add-NDEBUG export CCFLAGS="$CFLAGS" + # Fix builds with GCC 4.8 + if [[ $(gcc-major-version) -ge 4 && $(gcc-minor-version) -ge 8 ]]; then + CCFLAGS+=" -Wno-unused-local-typedefs" + fi + mkdir -p third_party/libevent echo '#include ' > third_party/libevent/event.h } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r410.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r411.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r410.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r411.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index c3b3e0c85a..94b4eae0ef 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -54,6 +54,11 @@ src_compile() { append-ldflags -nopie fi + # Fix builds with GCC 4.8 + if [[ $(gcc-major-version) -ge 4 && $(gcc-minor-version) -ge 8 ]]; then + append-flags -Wno-unused-local-typedefs + fi + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG cros-debug-add-NDEBUG export CCFLAGS="$CFLAGS"