| 1 |
commit: 0dc9c1d46d3e318a84af8fc89c9037915fa237d0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 29 21:10:29 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 30 11:45:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc9c1d4 |
| 7 |
|
| 8 |
www-client/firefox: fix PATH for FEATURES=ccache/distcc |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/627726 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/firefox/firefox-68.6.0-r2.ebuild | 24 ++++++++++++++++++++++++ |
| 14 |
www-client/firefox/firefox-74.0-r2.ebuild | 24 ++++++++++++++++++++++++ |
| 15 |
2 files changed, 48 insertions(+) |
| 16 |
|
| 17 |
diff --git a/www-client/firefox/firefox-68.6.0-r2.ebuild b/www-client/firefox/firefox-68.6.0-r2.ebuild |
| 18 |
index eb63ae0f71d..270ebf15640 100644 |
| 19 |
--- a/www-client/firefox/firefox-68.6.0-r2.ebuild |
| 20 |
+++ b/www-client/firefox/firefox-68.6.0-r2.ebuild |
| 21 |
@@ -189,6 +189,21 @@ if [[ -z $GMP_PLUGIN_LIST ]] ; then |
| 22 |
GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) |
| 23 |
fi |
| 24 |
|
| 25 |
+fix_path() { |
| 26 |
+ local value_to_move=${1} |
| 27 |
+ local new_path path_value |
| 28 |
+ IFS=:; local -a path_values=( ${PATH} ) |
| 29 |
+ for path_value in "${path_values[@]}" ; do |
| 30 |
+ if [[ ${path_value} == *"${value_to_move}"* ]] ; then |
| 31 |
+ new_path="${path_value}${new_path:+:}${new_path}" |
| 32 |
+ else |
| 33 |
+ new_path+="${new_path:+:}${path_value}" |
| 34 |
+ fi |
| 35 |
+ done |
| 36 |
+ |
| 37 |
+ echo "${new_path}" |
| 38 |
+} |
| 39 |
+ |
| 40 |
llvm_check_deps() { |
| 41 |
if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then |
| 42 |
ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 43 |
@@ -262,6 +277,15 @@ pkg_setup() { |
| 44 |
addpredict /proc/self/oom_score_adj |
| 45 |
|
| 46 |
llvm_pkg_setup |
| 47 |
+ |
| 48 |
+ # Workaround for #627726 |
| 49 |
+ if has ccache ${FEATURES} ; then |
| 50 |
+ einfo "Fixing PATH for FEATURES=ccache ..." |
| 51 |
+ PATH=$(fix_path 'ccache/bin') |
| 52 |
+ elif has distcc ${FEATURES} ; then |
| 53 |
+ einfo "Fixing PATH for FEATURES=distcc ..." |
| 54 |
+ PATH=$(fix_path 'distcc/bin') |
| 55 |
+ fi |
| 56 |
} |
| 57 |
|
| 58 |
src_unpack() { |
| 59 |
|
| 60 |
diff --git a/www-client/firefox/firefox-74.0-r2.ebuild b/www-client/firefox/firefox-74.0-r2.ebuild |
| 61 |
index b6ff763a5bf..bf2680e3147 100644 |
| 62 |
--- a/www-client/firefox/firefox-74.0-r2.ebuild |
| 63 |
+++ b/www-client/firefox/firefox-74.0-r2.ebuild |
| 64 |
@@ -199,6 +199,21 @@ if [[ -z $GMP_PLUGIN_LIST ]] ; then |
| 65 |
GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) |
| 66 |
fi |
| 67 |
|
| 68 |
+fix_path() { |
| 69 |
+ local value_to_move=${1} |
| 70 |
+ local new_path path_value |
| 71 |
+ IFS=:; local -a path_values=( ${PATH} ) |
| 72 |
+ for path_value in "${path_values[@]}" ; do |
| 73 |
+ if [[ ${path_value} == *"${value_to_move}"* ]] ; then |
| 74 |
+ new_path="${path_value}${new_path:+:}${new_path}" |
| 75 |
+ else |
| 76 |
+ new_path+="${new_path:+:}${path_value}" |
| 77 |
+ fi |
| 78 |
+ done |
| 79 |
+ |
| 80 |
+ echo "${new_path}" |
| 81 |
+} |
| 82 |
+ |
| 83 |
llvm_check_deps() { |
| 84 |
if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then |
| 85 |
ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 |
| 86 |
@@ -280,6 +295,15 @@ pkg_setup() { |
| 87 |
addpredict /proc/self/oom_score_adj |
| 88 |
|
| 89 |
llvm_pkg_setup |
| 90 |
+ |
| 91 |
+ # Workaround for #627726 |
| 92 |
+ if has ccache ${FEATURES} ; then |
| 93 |
+ einfo "Fixing PATH for FEATURES=ccache ..." |
| 94 |
+ PATH=$(fix_path 'ccache/bin') |
| 95 |
+ elif has distcc ${FEATURES} ; then |
| 96 |
+ einfo "Fixing PATH for FEATURES=distcc ..." |
| 97 |
+ PATH=$(fix_path 'distcc/bin') |
| 98 |
+ fi |
| 99 |
} |
| 100 |
|
| 101 |
src_unpack() { |
Archives