1 |
commit: e0d7fc6a25fcbe8dfc7853e3e878bd42148422dc |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 31 09:08:27 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 31 09:08:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d7fc6a |
7 |
|
8 |
dev-util/android-tools: fix 9.9.0_p3 CC bug 674162 |
9 |
|
10 |
Reported-by: Toralf Förster <toralf <AT> gentoo.org> |
11 |
Closes: https://bugs.gentoo.org/674162 |
12 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
13 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
14 |
|
15 |
dev-util/android-tools/android-tools-9.0.0_p3.ebuild | 20 ++++++++++---------- |
16 |
1 file changed, 10 insertions(+), 10 deletions(-) |
17 |
|
18 |
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 |
19 |
index 6399a1eb13c..5a8c4c5ac0c 100644 |
20 |
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild |
21 |
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild |
22 |
@@ -95,6 +95,16 @@ src_prepare() { |
23 |
cd "${S}" || die |
24 |
default |
25 |
|
26 |
+ sed -E \ |
27 |
+ -e "s|^(CC =).*|\\1 $(tc-getCC)|g" \ |
28 |
+ -e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \ |
29 |
+ -e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \ |
30 |
+ -e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \ |
31 |
+ -e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \ |
32 |
+ -e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \ |
33 |
+ -e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \ |
34 |
+ -i build.ninja || die |
35 |
+ |
36 |
# The pregenerated ninja file expects the build/ dir. |
37 |
BUILD_DIR="${CMAKE_USE_DIR}/build" |
38 |
cmake-utils_src_prepare |
39 |
@@ -104,16 +114,6 @@ src_configure() { |
40 |
append-lfs-flags |
41 |
|
42 |
cmake-utils_src_configure |
43 |
- |
44 |
- sed -i \ |
45 |
- -e "s:@CC@:$(tc-getCC):g" \ |
46 |
- -e "s:@CXX@:$(tc-getCXX):g" \ |
47 |
- -e "s:@CFLAGS@:${CFLAGS}:g" \ |
48 |
- -e "s:@CPPFLAGS@:${CPPFLAGS}:g" \ |
49 |
- -e "s:@CXXFLAGS@:${CXXFLAGS}:g" \ |
50 |
- -e "s:@LDFLAGS@:${LDFLAGS}:g" \ |
51 |
- -e "s:@PV@:${PV}:g" \ |
52 |
- build.ninja || die |
53 |
} |
54 |
|
55 |
src_compile() { |