Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pms:master commit in: /
Date: Tue, 11 Apr 2017 17:25:54
Message-Id: 1491929700.7a04d1e8577ec052e8309b1daf1d96ddeea40fa7.ulm@gentoo
1 commit: 7a04d1e8577ec052e8309b1daf1d96ddeea40fa7
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 11 16:55:00 2017 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 11 16:55:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=7a04d1e8
7
8 Revert "WORKDIR and S have the same scope as FILESDIR and DISTDIR."
9
10 This reverts commit 65d38361a953c0b6da4cc192d8727b0d6f1c64cc.
11
12 ebuild-env-vars.tex | 24 ++++++++++++------------
13 1 file changed, 12 insertions(+), 12 deletions(-)
14
15 diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
16 index d8ccd6c..1e155f5 100644
17 --- a/ebuild-env-vars.tex
18 +++ b/ebuild-env-vars.tex
19 @@ -95,18 +95,6 @@ variable.
20 Ditto &
21 Yes &
22 The full path to the directory in which the files in the \t{A} variable are stored. \\
23 -\t{WORKDIR} &
24 - Ditto &
25 - Yes &
26 - The full path to the ebuild's working directory, where all build data should be contained.%
27 - \label{env-var-WORKDIR} \\
28 -\t{S} &
29 - Ditto &
30 - Yes &
31 - The full path to the temporary build directory, used by \t{src\_compile}, \t{src\_install} etc.
32 - Defaults to \t{\$\{WORKDIR\}/\$\{P\}}. May be modified by ebuilds. If \t{S} is assigned in the
33 - global scope of an ebuild, then the restrictions of section~\ref{sec:ebuild-env-state} for
34 - global variables apply. \\
35 \t{PORTDIR} &
36 \t{src\_*} &
37 No &
38 @@ -202,6 +190,18 @@ variable.
39 was executed by the package manager. May be unset or any single word that is not any of the
40 above when the ebuild is being sourced for other (e.\,g.\ metadata or QA) purposes. Only for
41 EAPIs listed in table~\ref{tab:added-env-vars-table} as supporting \t{EBUILD\_PHASE\_FUNC}. \\
42 +\t{WORKDIR} &
43 + \t{src\_*}, global~scope &
44 + Yes &
45 + The full path to the ebuild's working directory, in which all build data should be
46 + contained. \label{env-var-WORKDIR} \\
47 +\t{S} &
48 + \t{src\_*} &
49 + Yes &
50 + The full path to the temporary build directory, used by \t{src\_compile}, \t{src\_install} etc.
51 + Defaults to \t{\$\{WORKDIR\}/\$\{P\}}. May be modified by ebuilds. If \t{S} is assigned in the
52 + global scope of an ebuild, then the restrictions of section~\ref{sec:ebuild-env-state} for
53 + global variables apply. \\
54 \t{KV} &
55 All &
56 Yes &