1 |
Also, skip preinst_mask phase when INSTALL_MASK is empty. |
2 |
--- |
3 |
bin/misc-functions.sh | 8 -------- |
4 |
bin/phase-functions.sh | 12 +++++++++++- |
5 |
2 files changed, 11 insertions(+), 9 deletions(-) |
6 |
|
7 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
8 |
index 7643af7b5..742ce40d2 100755 |
9 |
--- a/bin/misc-functions.sh |
10 |
+++ b/bin/misc-functions.sh |
11 |
@@ -375,14 +375,6 @@ preinst_mask() { |
12 |
# in there in case any tools were built with -pg in CFLAGS. |
13 |
cd "${T}" |
14 |
|
15 |
- # remove man pages, info pages, docs if requested |
16 |
- local f |
17 |
- for f in man info doc; do |
18 |
- if has no${f} $FEATURES; then |
19 |
- INSTALL_MASK="${INSTALL_MASK} /usr/share/${f}" |
20 |
- fi |
21 |
- done |
22 |
- |
23 |
install_mask "${ED}" "${INSTALL_MASK}" |
24 |
|
25 |
# remove share dir if unnessesary |
26 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
27 |
index 3aae3ef56..bdae68f79 100644 |
28 |
--- a/bin/phase-functions.sh |
29 |
+++ b/bin/phase-functions.sh |
30 |
@@ -660,13 +660,23 @@ __dyn_install() { |
31 |
cd "${PORTAGE_BUILDDIR}"/build-info |
32 |
set -f |
33 |
local f x |
34 |
+ |
35 |
+ # remove man pages, info pages, docs if requested |
36 |
+ for f in man info doc; do |
37 |
+ if has no${f} ${FEATURES} && \ |
38 |
+ ! has "/usr/share/${f}" ${INSTALL_MASK}; then |
39 |
+ INSTALL_MASK+=" /usr/share/${f}" |
40 |
+ fi |
41 |
+ done |
42 |
+ |
43 |
IFS=$' \t\n\r' |
44 |
for f in CATEGORY DEFINED_PHASES FEATURES INHERITED IUSE \ |
45 |
PF PKGUSE SLOT KEYWORDS HOMEPAGE DESCRIPTION \ |
46 |
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX \ |
47 |
CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ |
48 |
LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \ |
49 |
- QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE ; do |
50 |
+ QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE \ |
51 |
+ INSTALL_MASK PKG_INSTALL_MASK; do |
52 |
|
53 |
x=$(echo -n ${!f}) |
54 |
[[ -n $x ]] && echo "$x" > $f |
55 |
-- |
56 |
2.13.6 |