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 6A54F139083 for ; Fri, 15 Dec 2017 08:33:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2016E0FE3; Fri, 15 Dec 2017 08:33:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 C4B36E0FE3 for ; Fri, 15 Dec 2017 08:33:30 +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 BF79433BE18 for ; Fri, 15 Dec 2017 08:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82FC2AE74 for ; Fri, 15 Dec 2017 08:33:28 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1513326617.748d20380aa1b27149dc1b80c7eaf15fde7c6aba.grobian@gentoo> Subject: [gentoo-commits] proj/gcc-config:master commit in: / X-VCS-Repository: proj/gcc-config X-VCS-Files: gcc-config X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 748d20380aa1b27149dc1b80c7eaf15fde7c6aba X-VCS-Branch: master Date: Fri, 15 Dec 2017 08:33:28 +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-Archives-Salt: 116aef69-8e69-48ae-9ef9-5a8182f96377 X-Archives-Hash: bac45661f1179e9fec7138004962110c commit: 748d20380aa1b27149dc1b80c7eaf15fde7c6aba Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 15 08:30:17 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 15 08:30:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=748d2038 gcc-config: ensure we run env-update for prefix too The intention of commit cfbb9e94ca23c360d5801946e39da29c7d422dfc was to disable running ldconfig and updating ld.so.conf for prefix, but the implementation was too greedy and also disabled env-update, which we need to activate a compiler, see bug #641096. Bug: https://bugs.gentoo.org/641096 gcc-config | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc-config b/gcc-config index 7fcde15..ff8d8ac 100755 --- a/gcc-config +++ b/gcc-config @@ -693,16 +693,18 @@ switch_profile() { [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] then # in case python is broken ... - if [[ -z ${EPREFIX} ]] && ! env-update ; then + if ! env-update ; then echo "" ewarn "env-update failed to work properly; making sure ld.so.conf paths" ewarn "are setup properly. Please rerun gcc-config with the -f option." echo "" - if [[ ! -d /etc/ld.so.conf.d ]] ; then - show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ - | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf + if [[ -z ${EPREFIX} ]] ; then + if [[ ! -d /etc/ld.so.conf.d ]] ; then + show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ + | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf + fi + ldconfig fi - ldconfig fi else envd_changed=0