commit: e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Dec 31 09:08:27 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <toralf <AT> gentoo.org> Closes: https://bugs.gentoo.org/674162 Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Zac Medico <zmedico <AT> 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() {
