From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RkflD-0002R6-Se for garchives@archives.gentoo.org; Tue, 10 Jan 2012 17:45:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBBEB21C085; Tue, 10 Jan 2012 17:45:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7612521C085 for ; Tue, 10 Jan 2012 17:45:08 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5FE21B401A for ; Tue, 10 Jan 2012 17:45:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 500A680044 for ; Tue, 10 Jan 2012 17:45:07 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <4b881a4d55a20639caf2f89b2f9b7548446fd81e.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 4b881a4d55a20639caf2f89b2f9b7548446fd81e Date: Tue, 10 Jan 2012 17:45:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c6c54f1f-11be-4b14-9408-b9abef36b211 X-Archives-Hash: 43a46ab75e76591dfc57525a39907fe1 commit: 4b881a4d55a20639caf2f89b2f9b7548446fd81e Author: Fabian Groffen gentoo org> AuthorDate: Tue Jan 10 17:33:16 2012 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jan 10 17:33:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4b881a4d Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Conflicts: bin/ebuild.sh bin/phase-functions.sh pym/portage/util/__init__.py bin/ebuild.sh | 4 ++-- bin/phase-functions.sh | 4 ++-- bin/repoman | 17 ++------------= --- doc/package/ebuild/eapi/4-python.docbook | 17 ++++++++++++++= +++ man/ebuild.5 | 2 +- man/repoman.1 | 6 ------ pym/portage/eapi.py | 5 ++++- .../package/ebuild/_config/special_env_vars.py | 6 +++--- pym/portage/package/ebuild/doebuild.py | 11 ++++++++--- pym/portage/repository/config.py | 19 +++++++++++++-= ----- pym/portage/util/__init__.py | 17 ++++++++++++++= ++- pym/portage/util/env_update.py | 4 ---- 12 files changed, 68 insertions(+), 44 deletions(-) diff --cc bin/ebuild.sh index 30c34e8,f8e71f5..efd6285 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@@ -1,9 -1,9 +1,9 @@@ -#!/bin/bash +#!@PORTAGE_BASH@ - # Copyright 1999-2011 Gentoo Foundation + # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 -PORTAGE_BIN_PATH=3D"${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" -PORTAGE_PYM_PATH=3D"${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" +PORTAGE_BIN_PATH=3D"${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}" +PORTAGE_PYM_PATH=3D"${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}" =20 # Prevent aliases from causing portage to act inappropriately. # Make sure it's before everything so we don't mess aliases that follow= . diff --cc bin/phase-functions.sh index c002a34,ce251ce..86df843 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -1,5 -1,5 +1,5 @@@ -#!/bin/bash +#!@PREFIX_PORTAGE_BASH@ - # Copyright 1999-2011 Gentoo Foundation + # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 # Hardcoded bash lists are needed for backward compatibility with diff --cc pym/portage/util/__init__.py index 257da65,58501dc..3fdc5cf --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@@ -1600,22 -1614,10 +1615,22 @@@ def getlibpaths(root, env=3DNone) """ Return a list of paths that are used for library lookups """ if env is None: env =3D os.environ + + # PREFIX HACK: LD_LIBRARY_PATH isn't portable, and considered + # harmfull, so better not use it. We don't need any host OS lib + # paths either, so do Prefix case. + if EPREFIX !=3D '': + rval =3D [] + rval.append(EPREFIX + "/usr/lib") + rval.append(EPREFIX + "/lib") + # we don't know the CHOST here, so it's a bit hard to guess + # where GCC's and ld's libs are. Though, GCC's libs should be + # in lib and usr/lib, binutils' libs rarely used + else: # the following is based on the information from ld.so(8) - rval =3D env.get("LD_LIBRARY_PATH", "").split(":") - rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf"))) - rval.append("/usr/lib") - rval.append("/lib") + rval =3D env.get("LD_LIBRARY_PATH", "").split(":") - rval.extend(grabfile(os.path.join(root, "etc", "ld.so.conf"))) ++ rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf"))) + rval.append("/usr/lib") + rval.append("/lib") =20 return [normalize_path(x) for x in rval if x]