| 1 |
commit: 4b881a4d55a20639caf2f89b2f9b7548446fd81e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 17:33:16 2012 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 17:33:16 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4b881a4d |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
bin/ebuild.sh |
| 12 |
bin/phase-functions.sh |
| 13 |
pym/portage/util/__init__.py |
| 14 |
|
| 15 |
|
| 16 |
bin/ebuild.sh | 4 ++-- |
| 17 |
bin/phase-functions.sh | 4 ++-- |
| 18 |
bin/repoman | 17 ++--------------- |
| 19 |
doc/package/ebuild/eapi/4-python.docbook | 17 +++++++++++++++++ |
| 20 |
man/ebuild.5 | 2 +- |
| 21 |
man/repoman.1 | 6 ------ |
| 22 |
pym/portage/eapi.py | 5 ++++- |
| 23 |
.../package/ebuild/_config/special_env_vars.py | 6 +++--- |
| 24 |
pym/portage/package/ebuild/doebuild.py | 11 ++++++++--- |
| 25 |
pym/portage/repository/config.py | 19 +++++++++++++------ |
| 26 |
pym/portage/util/__init__.py | 17 ++++++++++++++++- |
| 27 |
pym/portage/util/env_update.py | 4 ---- |
| 28 |
12 files changed, 68 insertions(+), 44 deletions(-) |
| 29 |
|
| 30 |
diff --cc bin/ebuild.sh |
| 31 |
index 30c34e8,f8e71f5..efd6285 |
| 32 |
--- a/bin/ebuild.sh |
| 33 |
+++ b/bin/ebuild.sh |
| 34 |
@@@ -1,9 -1,9 +1,9 @@@ |
| 35 |
-#!/bin/bash |
| 36 |
+#!@PORTAGE_BASH@ |
| 37 |
- # Copyright 1999-2011 Gentoo Foundation |
| 38 |
+ # Copyright 1999-2012 Gentoo Foundation |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
|
| 41 |
-PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" |
| 42 |
-PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" |
| 43 |
+PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}" |
| 44 |
+PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}" |
| 45 |
|
| 46 |
# Prevent aliases from causing portage to act inappropriately. |
| 47 |
# Make sure it's before everything so we don't mess aliases that follow. |
| 48 |
diff --cc bin/phase-functions.sh |
| 49 |
index c002a34,ce251ce..86df843 |
| 50 |
--- a/bin/phase-functions.sh |
| 51 |
+++ b/bin/phase-functions.sh |
| 52 |
@@@ -1,5 -1,5 +1,5 @@@ |
| 53 |
-#!/bin/bash |
| 54 |
+#!@PREFIX_PORTAGE_BASH@ |
| 55 |
- # Copyright 1999-2011 Gentoo Foundation |
| 56 |
+ # Copyright 1999-2012 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
# Hardcoded bash lists are needed for backward compatibility with |
| 60 |
diff --cc pym/portage/util/__init__.py |
| 61 |
index 257da65,58501dc..3fdc5cf |
| 62 |
--- a/pym/portage/util/__init__.py |
| 63 |
+++ b/pym/portage/util/__init__.py |
| 64 |
@@@ -1600,22 -1614,10 +1615,22 @@@ def getlibpaths(root, env=None) |
| 65 |
""" Return a list of paths that are used for library lookups """ |
| 66 |
if env is None: |
| 67 |
env = os.environ |
| 68 |
+ |
| 69 |
+ # PREFIX HACK: LD_LIBRARY_PATH isn't portable, and considered |
| 70 |
+ # harmfull, so better not use it. We don't need any host OS lib |
| 71 |
+ # paths either, so do Prefix case. |
| 72 |
+ if EPREFIX != '': |
| 73 |
+ rval = [] |
| 74 |
+ rval.append(EPREFIX + "/usr/lib") |
| 75 |
+ rval.append(EPREFIX + "/lib") |
| 76 |
+ # we don't know the CHOST here, so it's a bit hard to guess |
| 77 |
+ # where GCC's and ld's libs are. Though, GCC's libs should be |
| 78 |
+ # in lib and usr/lib, binutils' libs rarely used |
| 79 |
+ else: |
| 80 |
# the following is based on the information from ld.so(8) |
| 81 |
- rval = env.get("LD_LIBRARY_PATH", "").split(":") |
| 82 |
- rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf"))) |
| 83 |
- rval.append("/usr/lib") |
| 84 |
- rval.append("/lib") |
| 85 |
+ rval = env.get("LD_LIBRARY_PATH", "").split(":") |
| 86 |
- rval.extend(grabfile(os.path.join(root, "etc", "ld.so.conf"))) |
| 87 |
++ rval.extend(read_ld_so_conf(os.path.join(root, "etc", "ld.so.conf"))) |
| 88 |
+ rval.append("/usr/lib") |
| 89 |
+ rval.append("/lib") |
| 90 |
|
| 91 |
return [normalize_path(x) for x in rval if x] |
Archives