From 913878a8c35a17754baf515814378acfba169e21 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 27 Aug 2014 21:08:27 -0700 Subject: [PATCH] update_engine: fix using delta_generator from update.zip --- ....1-r402.ebuild => update_engine-0.0.1-r403.ebuild} | 0 .../update_engine/update_engine-9999.ebuild | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r402.ebuild => update_engine-0.0.1-r403.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r402.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r403.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r402.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r403.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 aaf6f0d414..120fedeee3 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 @@ -12,7 +12,7 @@ else KEYWORDS="amd64 arm x86" fi -inherit toolchain-funcs cros-debug cros-workon scons-utils systemd +inherit flag-o-matic toolchain-funcs cros-debug cros-workon scons-utils systemd DESCRIPTION="Chrome OS Update Engine" HOMEPAGE="http://www.chromium.org/" @@ -46,6 +46,15 @@ DEPEND="coreos-base/system_api ${RDEPEND}" src_compile() { + # Disable PIE when building for the SDK, this works around a bug that + # breaks using delta_generator from the update.zip bundle. + # https://code.google.com/p/chromium/issues/detail?id=394508 + # https://code.google.com/p/chromium/issues/detail?id=394241 + if use cros_host; then + append-flags -nopie + append-ldflags -nopie + fi + tc-export CC CXX AR RANLIB LD NM PKG_CONFIG cros-debug-add-NDEBUG export CCFLAGS="$CFLAGS"