From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9BF86138334 for ; Mon, 31 Dec 2018 09:11:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FD5CE0984; Mon, 31 Dec 2018 09:11:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B591E0984 for ; Mon, 31 Dec 2018 09:11:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DCE9335CC1 for ; Mon, 31 Dec 2018 09:11:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48FF24FB for ; Mon, 31 Dec 2018 09:11:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1546247322.e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-tools/android-tools-9.0.0_p3.ebuild X-VCS-Directories: dev-util/android-tools/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc X-VCS-Branch: master Date: Mon, 31 Dec 2018 09:11:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5dd0064-ae25-4f88-b1f0-7db815a64f79 X-Archives-Hash: 039afa2445fdbd7d124fd262e388e16f commit: e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc Author: Zac Medico gentoo org> AuthorDate: Mon Dec 31 09:08:27 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Dec 31 09:08:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d7fc6a dev-util/android-tools: fix 9.9.0_p3 CC bug 674162 Reported-by: Toralf Förster gentoo.org> Closes: https://bugs.gentoo.org/674162 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Zac Medico gentoo.org> dev-util/android-tools/android-tools-9.0.0_p3.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild index 6399a1eb13c..5a8c4c5ac0c 100644 --- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild +++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild @@ -95,6 +95,16 @@ src_prepare() { cd "${S}" || die default + sed -E \ + -e "s|^(CC =).*|\\1 $(tc-getCC)|g" \ + -e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \ + -e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \ + -e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \ + -e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \ + -e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \ + -e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \ + -i build.ninja || die + # The pregenerated ninja file expects the build/ dir. BUILD_DIR="${CMAKE_USE_DIR}/build" cmake-utils_src_prepare @@ -104,16 +114,6 @@ src_configure() { append-lfs-flags cmake-utils_src_configure - - sed -i \ - -e "s:@CC@:$(tc-getCC):g" \ - -e "s:@CXX@:$(tc-getCXX):g" \ - -e "s:@CFLAGS@:${CFLAGS}:g" \ - -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \ - -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \ - -e "s:@LDFLAGS@:${LDFLAGS}:g" \ - -e "s:@PV@:${PV}:g" \ - build.ninja || die } src_compile() {