[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#601839: debian/rules: reword build-arch, build-indep one line fix



Jonathan Nieder <jrnieder@gmail.com> writes:

> I believe the intent is as follows:

>  - if both build-arch and build-indep are provided, the build target
>    would depend on both;
>  - if build-arch is provided but not build-indep, the build target
>    would depend on build-arch;
>  - if build-indep is provided but not build-arch, the build target
>    would depend on build-indep;
>  - if neither build-indep nor build-arch is provided, the build target
>    is just fine. :)

Yes.  It's fairly clear from the language in the rest of the section that
that was the intention.  The introductory sentence was rather confusing.

> In other words, the current wording takes into account that only one of
> the build-{arch,indep} targets might be provided while your proposed
> wording does not.

> I believe the current wording has a similar problem already:

> 	“A package may also provide both of the targets build-arch and
> 	build-indep.”

> It would be clearer to say “A package may also provide one or both of
> the targets build-arch and build-indep.”  Like so, perhaps?

This is borderline for an informative change, but I think it makes the
current wording much clearer and more accurate, so I'm going ahead with
the following patch.  (And this is all going to go away in the next
normative version of Policy provided that I can find the time to put
together the tech-ctte ballot anyway.)

diff --git a/policy.sgml b/policy.sgml
index 465a129..2c0c72a 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -1951,7 +1951,7 @@
 	    </tag>
 	    <item>
 	      <p>
-		A package may also provide both of the targets
+		A package may also provide one or both of the targets
 		<tt>build-arch</tt> and <tt>build-indep</tt>.
 		The <tt>build-arch</tt> target, if provided, should
 		perform all the configuration and compilation required for
@@ -1964,9 +1964,13 @@
 		architecture-independent binary packages (those packages
 		for which the body of the <tt>Architecture</tt> field
 		in <tt>debian/control</tt> is <tt>all</tt>).
-		The <tt>build</tt> target should depend on those of the
-		targets <tt>build-arch</tt> and <tt>build-indep</tt> that
-		are provided in the rules file.<footnote>
+	      </p>
+
+	      <p>
+		If <tt>build-arch</tt> or <tt>build-indep</tt> targets are
+		provided in the rules file, the <tt>build</tt> target
+		should either depend on those targets or take the same
+		actions as invoking those targets would perform.<footnote>
 		  The intent of this split is so that binary-only builds
 		  need not install the dependencies required for
 		  the <tt>build-indep</tt> target.  However, this is not

-- 
Russ Allbery (rra@debian.org)               <http://www.eyrie.org/~eagle/>



Reply to: