From a80eb950810ebdbc7452f2e03ba738abaf2d5a5a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 23 Dec 2012 13:09:46 -0500 Subject: [PATCH] tpm-tools: drop -m64 hardcode The configure script will add -m64 to x86_64 targets. This doesn't make sense for actual 64bit targets, and breaks x32 targets. Update the sed to match upstream Gentoo's ebuild. BUG=chromium-os:36866 TEST=`emerge-x32-generic tpm-tools` now works Change-Id: If9a8527ee87101938b62c2b43c96746883800e95 Reviewed-on: https://gerrit.chromium.org/gerrit/40186 Reviewed-by: Kees Cook Commit-Queue: Mike Frysinger Tested-by: Mike Frysinger --- .../app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild index 31dea2e495..e84c86b851 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild @@ -24,7 +24,9 @@ DEPEND="${COMMON_DEPEND} nls? ( sys-devel/gettext )" src_prepare() { - sed -i -e "s/-Werror //" configure.in || die "Sed failed" + sed -i -r \ + -e '/CFLAGS/s/ -(Werror|m64)//' \ + configure.in || die epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch epatch "${FILESDIR}"/${PN}-1.3.5-password.patch