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 F1C8F138350 for ; Mon, 30 Mar 2020 11:46:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC98DE097E; Mon, 30 Mar 2020 11:46:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 81D3EE097E for ; Mon, 30 Mar 2020 11:46:15 +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 3B58634F453 for ; Mon, 30 Mar 2020 11:46:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C70D21B1 for ; Mon, 30 Mar 2020 11:46:10 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1585568709.0dc9c1d46d3e318a84af8fc89c9037915fa237d0.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-68.6.0-r2.ebuild www-client/firefox/firefox-74.0-r2.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 0dc9c1d46d3e318a84af8fc89c9037915fa237d0 X-VCS-Branch: master Date: Mon, 30 Mar 2020 11:46:10 +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: db2f5603-fc19-4e3c-b078-1cabb07f91ba X-Archives-Hash: 82585980a0c9ed250e095dbcf502d030 commit: 0dc9c1d46d3e318a84af8fc89c9037915fa237d0 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Mar 29 21:10:29 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Mar 30 11:45:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc9c1d4 www-client/firefox: fix PATH for FEATURES=ccache/distcc Bug: https://bugs.gentoo.org/627726 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox/firefox-68.6.0-r2.ebuild | 24 ++++++++++++++++++++++++ www-client/firefox/firefox-74.0-r2.ebuild | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/www-client/firefox/firefox-68.6.0-r2.ebuild b/www-client/firefox/firefox-68.6.0-r2.ebuild index eb63ae0f71d..270ebf15640 100644 --- a/www-client/firefox/firefox-68.6.0-r2.ebuild +++ b/www-client/firefox/firefox-68.6.0-r2.ebuild @@ -189,6 +189,21 @@ if [[ -z $GMP_PLUGIN_LIST ]] ; then GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) fi +fix_path() { + local value_to_move=${1} + local new_path path_value + IFS=:; local -a path_values=( ${PATH} ) + for path_value in "${path_values[@]}" ; do + if [[ ${path_value} == *"${value_to_move}"* ]] ; then + new_path="${path_value}${new_path:+:}${new_path}" + else + new_path+="${new_path:+:}${path_value}" + fi + done + + echo "${new_path}" +} + llvm_check_deps() { if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 @@ -262,6 +277,15 @@ pkg_setup() { addpredict /proc/self/oom_score_adj llvm_pkg_setup + + # Workaround for #627726 + if has ccache ${FEATURES} ; then + einfo "Fixing PATH for FEATURES=ccache ..." + PATH=$(fix_path 'ccache/bin') + elif has distcc ${FEATURES} ; then + einfo "Fixing PATH for FEATURES=distcc ..." + PATH=$(fix_path 'distcc/bin') + fi } src_unpack() { diff --git a/www-client/firefox/firefox-74.0-r2.ebuild b/www-client/firefox/firefox-74.0-r2.ebuild index b6ff763a5bf..bf2680e3147 100644 --- a/www-client/firefox/firefox-74.0-r2.ebuild +++ b/www-client/firefox/firefox-74.0-r2.ebuild @@ -199,6 +199,21 @@ if [[ -z $GMP_PLUGIN_LIST ]] ; then GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) fi +fix_path() { + local value_to_move=${1} + local new_path path_value + IFS=:; local -a path_values=( ${PATH} ) + for path_value in "${path_values[@]}" ; do + if [[ ${path_value} == *"${value_to_move}"* ]] ; then + new_path="${path_value}${new_path:+:}${new_path}" + else + new_path+="${new_path:+:}${path_value}" + fi + done + + echo "${new_path}" +} + llvm_check_deps() { if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 @@ -280,6 +295,15 @@ pkg_setup() { addpredict /proc/self/oom_score_adj llvm_pkg_setup + + # Workaround for #627726 + if has ccache ${FEATURES} ; then + einfo "Fixing PATH for FEATURES=ccache ..." + PATH=$(fix_path 'ccache/bin') + elif has distcc ${FEATURES} ; then + einfo "Fixing PATH for FEATURES=distcc ..." + PATH=$(fix_path 'distcc/bin') + fi } src_unpack() {