From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5BA89138438 for ; Sat, 12 Jan 2013 21:25:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2214BE062D; Sat, 12 Jan 2013 21:25:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55F38E062D for ; Sat, 12 Jan 2013 21:25:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A52A33DB91 for ; Sat, 12 Jan 2013 17:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A5DEFE4073 for ; Sat, 12 Jan 2013 17:20:37 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1358011405.cfbb9e94ca23c360d5801946e39da29c7d422dfc.vapier@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: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: cfbb9e94ca23c360d5801946e39da29c7d422dfc X-VCS-Branch: master Date: Sat, 12 Jan 2013 17:20:37 +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: 1f7de64a-3552-415d-9a8e-55561f05ceaf X-Archives-Hash: 43c370cb39a2cc86b81425c967e75d9e commit: cfbb9e94ca23c360d5801946e39da29c7d422dfc Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 5 16:42:24 2013 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 12 17:23:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=cfbb9e94 gcc-config: prefix: don't bother running ldconfig In Prefix we're unprivileged (most likely) so don't bother trying to update ld.so.conf or anything like that. Signed-off-by: Fabian Groffen gentoo.org> Signed-off-by: Mike Frysinger gentoo.org> --- gcc-config | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc-config b/gcc-config index 89fc32c..8d2347f 100755 --- a/gcc-config +++ b/gcc-config @@ -646,8 +646,8 @@ switch_profile() { # Pass all by default awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH|MULTIOSDIRS)=/ {print $0}' \ "${GCC_ENV_D}/${CC_COMP}" >> "${envd}.tmp" - if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then - echo "${MY_LDPATH}" > "${ROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf + if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then + echo "${MY_LDPATH}" > "${EROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf else echo "LDPATH=\"${MY_LDPATH}\"" >> "${envd}.tmp" fi @@ -692,7 +692,7 @@ switch_profile() { [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] then # in case python is broken ... - if ! env-update ; then + if [[ -z ${EPREFIX} ]] && ! 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."