1 |
commit: 9618f5501e3db3f29a16bfb92d4b104453258eae |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 21:31:39 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 28 05:58:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9618f550 |
7 |
|
8 |
{,PKG_}INSTALL_MASK: record value in vardb |
9 |
|
10 |
Also, skip preinst_mask phase when INSTALL_MASK is empty. |
11 |
|
12 |
bin/misc-functions.sh | 8 -------- |
13 |
bin/phase-functions.sh | 12 +++++++++++- |
14 |
2 files changed, 11 insertions(+), 9 deletions(-) |
15 |
|
16 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
17 |
index df8361036..ee65450f2 100755 |
18 |
--- a/bin/misc-functions.sh |
19 |
+++ b/bin/misc-functions.sh |
20 |
@@ -381,14 +381,6 @@ preinst_mask() { |
21 |
# in there in case any tools were built with -pg in CFLAGS. |
22 |
cd "${T}" |
23 |
|
24 |
- # remove man pages, info pages, docs if requested |
25 |
- local f |
26 |
- for f in man info doc; do |
27 |
- if has no${f} $FEATURES; then |
28 |
- INSTALL_MASK="${INSTALL_MASK} /usr/share/${f}" |
29 |
- fi |
30 |
- done |
31 |
- |
32 |
install_mask "${ED}" "${INSTALL_MASK}" |
33 |
|
34 |
# remove share dir if unnessesary |
35 |
|
36 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
37 |
index 3aae3ef56..bdae68f79 100644 |
38 |
--- a/bin/phase-functions.sh |
39 |
+++ b/bin/phase-functions.sh |
40 |
@@ -660,13 +660,23 @@ __dyn_install() { |
41 |
cd "${PORTAGE_BUILDDIR}"/build-info |
42 |
set -f |
43 |
local f x |
44 |
+ |
45 |
+ # remove man pages, info pages, docs if requested |
46 |
+ for f in man info doc; do |
47 |
+ if has no${f} ${FEATURES} && \ |
48 |
+ ! has "/usr/share/${f}" ${INSTALL_MASK}; then |
49 |
+ INSTALL_MASK+=" /usr/share/${f}" |
50 |
+ fi |
51 |
+ done |
52 |
+ |
53 |
IFS=$' \t\n\r' |
54 |
for f in CATEGORY DEFINED_PHASES FEATURES INHERITED IUSE \ |
55 |
PF PKGUSE SLOT KEYWORDS HOMEPAGE DESCRIPTION \ |
56 |
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX \ |
57 |
CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ |
58 |
LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \ |
59 |
- QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE ; do |
60 |
+ QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE \ |
61 |
+ INSTALL_MASK PKG_INSTALL_MASK; do |
62 |
|
63 |
x=$(echo -n ${!f}) |
64 |
[[ -n $x ]] && echo "$x" > $f |