| 1 |
commit: d6b379cff421282d6a0dac5f4ea65be40df4175a |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 3 15:19:56 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 3 15:19:56 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d6b379cf |
| 7 |
|
| 8 |
misc-functions.sh: don't set local ED/EPREFIX some more |
| 9 |
|
| 10 |
In Prefix EPREFIX, ED are always set, so don't try to redefine them with |
| 11 |
wrong values (or local). In fact, it fails because ED and EPREFIX are |
| 12 |
defined as read-only. |
| 13 |
|
| 14 |
--- |
| 15 |
bin/misc-functions.sh | 24 ++++++++++++++++++------ |
| 16 |
1 files changed, 18 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 19 |
index 58f5bc8..20d52a7 100644 |
| 20 |
--- a/bin/misc-functions.sh |
| 21 |
+++ b/bin/misc-functions.sh |
| 22 |
@@ -70,7 +70,9 @@ canonicalize() { |
| 23 |
prepcompress() { |
| 24 |
local -a include exclude incl_d incl_f |
| 25 |
local f g i real_f real_d |
| 26 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 27 |
+ # PREFIX LOCAL: always support ED |
| 28 |
+ #case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 29 |
+ # END PREFIX LOCAL |
| 30 |
|
| 31 |
# Canonicalize path names and check for their existence. |
| 32 |
real_d=$(canonicalize "${ED}") |
| 33 |
@@ -1514,7 +1516,9 @@ preinst_mask() { |
| 34 |
return 1 |
| 35 |
fi |
| 36 |
|
| 37 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 38 |
+ # PREFIX LOCAL: always support ED |
| 39 |
+ #case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 40 |
+ # END PREFIX LOCAL |
| 41 |
|
| 42 |
# Make sure $PWD is not ${D} so that we don't leave gmon.out files |
| 43 |
# in there in case any tools were built with -pg in CFLAGS. |
| 44 |
@@ -1542,7 +1546,9 @@ preinst_sfperms() { |
| 45 |
return 1 |
| 46 |
fi |
| 47 |
|
| 48 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 49 |
+ # PREFIX LOCAL: always support ED |
| 50 |
+ #case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 51 |
+ # END PREFIX LOCAL |
| 52 |
|
| 53 |
# Smart FileSystem Permissions |
| 54 |
if has sfperms $FEATURES; then |
| 55 |
@@ -1580,7 +1586,9 @@ preinst_suid_scan() { |
| 56 |
return 1 |
| 57 |
fi |
| 58 |
|
| 59 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 60 |
+ # PREFIX LOCAL: always support ED |
| 61 |
+ #case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 62 |
+ # END PREFIX LOCAL |
| 63 |
|
| 64 |
# total suid control. |
| 65 |
if has suidctl $FEATURES; then |
| 66 |
@@ -1645,7 +1653,9 @@ preinst_selinux_labels() { |
| 67 |
|
| 68 |
dyn_package() { |
| 69 |
|
| 70 |
- case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 71 |
+ # PREFIX LOCAL: always support ED |
| 72 |
+ #case "$EAPI" in 0|1|2) local ED=${D} ;; esac |
| 73 |
+ # END PREFIX LOCAL |
| 74 |
|
| 75 |
# Make sure $PWD is not ${D} so that we don't leave gmon.out files |
| 76 |
# in there in case any tools were built with -pg in CFLAGS. |
| 77 |
@@ -1725,7 +1735,9 @@ __END1__ |
| 78 |
|
| 79 |
dyn_rpm() { |
| 80 |
|
| 81 |
- case "$EAPI" in 0|1|2) local EPREFIX= ;; esac |
| 82 |
+ # PREFIX LOCAL: always support ED |
| 83 |
+ #case "$EAPI" in 0|1|2) local EPREFIX= ;; esac |
| 84 |
+ # END PREFIX LOCAL |
| 85 |
|
| 86 |
cd "${T}" || die "cd failed" |
| 87 |
local machine_name=$(uname -m) |
Archives