| 1 |
commit: 0632d91c0b15668d32d7a32336bf196e7c25e850 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 29 01:33:15 2015 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 29 01:33:33 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0632d91c |
| 7 |
|
| 8 |
www-client/chromium: Fix build with clang |
| 9 |
|
| 10 |
Only set host vars when cross-compiling. |
| 11 |
This lets a native clang build work by default. |
| 12 |
|
| 13 |
https://bugs.gentoo.org/561726 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.22_p3 |
| 16 |
|
| 17 |
www-client/chromium/chromium-45.0.2454.101.ebuild | 14 ++++++++------ |
| 18 |
www-client/chromium/chromium-46.0.2490.42.ebuild | 14 ++++++++------ |
| 19 |
www-client/chromium/chromium-47.0.2516.0.ebuild | 14 ++++++++------ |
| 20 |
3 files changed, 24 insertions(+), 18 deletions(-) |
| 21 |
|
| 22 |
diff --git a/www-client/chromium/chromium-45.0.2454.101.ebuild b/www-client/chromium/chromium-45.0.2454.101.ebuild |
| 23 |
index 15fbe60..c450cda 100644 |
| 24 |
--- a/www-client/chromium/chromium-45.0.2454.101.ebuild |
| 25 |
+++ b/www-client/chromium/chromium-45.0.2454.101.ebuild |
| 26 |
@@ -469,17 +469,19 @@ src_configure() { |
| 27 |
fi |
| 28 |
|
| 29 |
# Make sure the build system will use the right tools, bug #340795. |
| 30 |
- tc-export AR CC CXX RANLIB |
| 31 |
+ tc-export AR CC CXX NM |
| 32 |
|
| 33 |
# Tools for building programs to be executed on the build system, bug #410883. |
| 34 |
- export AR_host=$(tc-getBUILD_AR) |
| 35 |
- export CC_host=$(tc-getBUILD_CC) |
| 36 |
- export CXX_host=$(tc-getBUILD_CXX) |
| 37 |
- export LD_host=${CXX_host} |
| 38 |
+ if tc-is-cross-compiler; then |
| 39 |
+ export AR_host=$(tc-getBUILD_AR) |
| 40 |
+ export CC_host=$(tc-getBUILD_CC) |
| 41 |
+ export CXX_host=$(tc-getBUILD_CXX) |
| 42 |
+ export NM_host=$(tc-getBUILD_NM) |
| 43 |
+ fi |
| 44 |
|
| 45 |
# Bug 491582. |
| 46 |
export TMPDIR="${WORKDIR}/temp" |
| 47 |
- mkdir -m 755 "${TMPDIR}" || die |
| 48 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
| 49 |
|
| 50 |
local build_ffmpeg_args="" |
| 51 |
if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
| 52 |
|
| 53 |
diff --git a/www-client/chromium/chromium-46.0.2490.42.ebuild b/www-client/chromium/chromium-46.0.2490.42.ebuild |
| 54 |
index 672ea96..565c1f7 100644 |
| 55 |
--- a/www-client/chromium/chromium-46.0.2490.42.ebuild |
| 56 |
+++ b/www-client/chromium/chromium-46.0.2490.42.ebuild |
| 57 |
@@ -469,17 +469,19 @@ src_configure() { |
| 58 |
fi |
| 59 |
|
| 60 |
# Make sure the build system will use the right tools, bug #340795. |
| 61 |
- tc-export AR CC CXX RANLIB |
| 62 |
+ tc-export AR CC CXX NM |
| 63 |
|
| 64 |
# Tools for building programs to be executed on the build system, bug #410883. |
| 65 |
- export AR_host=$(tc-getBUILD_AR) |
| 66 |
- export CC_host=$(tc-getBUILD_CC) |
| 67 |
- export CXX_host=$(tc-getBUILD_CXX) |
| 68 |
- export LD_host=${CXX_host} |
| 69 |
+ if tc-is-cross-compiler; then |
| 70 |
+ export AR_host=$(tc-getBUILD_AR) |
| 71 |
+ export CC_host=$(tc-getBUILD_CC) |
| 72 |
+ export CXX_host=$(tc-getBUILD_CXX) |
| 73 |
+ export NM_host=$(tc-getBUILD_NM) |
| 74 |
+ fi |
| 75 |
|
| 76 |
# Bug 491582. |
| 77 |
export TMPDIR="${WORKDIR}/temp" |
| 78 |
- mkdir -m 755 "${TMPDIR}" || die |
| 79 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
| 80 |
|
| 81 |
local build_ffmpeg_args="" |
| 82 |
if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
| 83 |
|
| 84 |
diff --git a/www-client/chromium/chromium-47.0.2516.0.ebuild b/www-client/chromium/chromium-47.0.2516.0.ebuild |
| 85 |
index 50afc7c..e8acf4a 100644 |
| 86 |
--- a/www-client/chromium/chromium-47.0.2516.0.ebuild |
| 87 |
+++ b/www-client/chromium/chromium-47.0.2516.0.ebuild |
| 88 |
@@ -477,17 +477,19 @@ src_configure() { |
| 89 |
fi |
| 90 |
|
| 91 |
# Make sure the build system will use the right tools, bug #340795. |
| 92 |
- tc-export AR CC CXX RANLIB |
| 93 |
+ tc-export AR CC CXX NM |
| 94 |
|
| 95 |
# Tools for building programs to be executed on the build system, bug #410883. |
| 96 |
- export AR_host=$(tc-getBUILD_AR) |
| 97 |
- export CC_host=$(tc-getBUILD_CC) |
| 98 |
- export CXX_host=$(tc-getBUILD_CXX) |
| 99 |
- export LD_host=${CXX_host} |
| 100 |
+ if tc-is-cross-compiler; then |
| 101 |
+ export AR_host=$(tc-getBUILD_AR) |
| 102 |
+ export CC_host=$(tc-getBUILD_CC) |
| 103 |
+ export CXX_host=$(tc-getBUILD_CXX) |
| 104 |
+ export NM_host=$(tc-getBUILD_NM) |
| 105 |
+ fi |
| 106 |
|
| 107 |
# Bug 491582. |
| 108 |
export TMPDIR="${WORKDIR}/temp" |
| 109 |
- mkdir -m 755 "${TMPDIR}" || die |
| 110 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
| 111 |
|
| 112 |
local build_ffmpeg_args="" |
| 113 |
if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
Archives