Add Build-Depends-Arch and Build-Conflicts-Arch

dpkg currently supports
  Build-Depends (arch all and any)
  Build-Depends-Indep (arch all)
and the same Build-Conflicts.

This patch adds
  Build-Depends-Arch (arch any)
and Build-Conflicts-Arch.

This makes the support for build dependencies for arch all and any
packages symmetrical and more logical. It also permits arch-any
dependencies to be omitted for arch-all-only builds.

This change will not break any existing packages: if the arch any
deps are in Build-Depends, they may be installed unnecessarily,
but they will still be installed. This change just allows an
additional optimisation, and tidies up a slight omission in the
original implementation of build dependencies, and would give the
buildds additional options when arch-all autobuilding is enabled
(especially now it's available as a separate independent arch).

Closes: #629480

Signed-off-by: Roger Leigh <rleigh@debian.org>
Signed-off-by: Guillem Jover <guillem@debian.org>

1 files changed, 13 insertions, 3 deletions

diff --git a/scripts/Dpkg/Control/Fields.pm b/scripts/Dpkg/Control/Fields.pm
index 41b5d9ca8..8ff4c4779 100644
--- a/scripts/Dpkg/Control/Fields.pm
+++ b/scripts/Dpkg/Control/Fields.pm
@@ -61,23 +61,33 @@ our %FIELDS = (
     'Build-Conflicts' => {
         allowed => ALL_SRC,
         dependency => 'union',
-        dep_order => 3,
+        dep_order => 4,
+    },
+    'Build-Conflicts-Arch' => {
+        allowed => ALL_SRC,
+        dependency => 'union',
+        dep_order => 5,
     },
     'Build-Conflicts-Indep' => {
         allowed => ALL_SRC,
         dependency => 'union',
-        dep_order => 4,
+        dep_order => 6,
     },
     'Build-Depends' => {
         allowed => ALL_SRC,
         dependency => 'normal',
         dep_order => 1,
     },
-    'Build-Depends-Indep' => {
+    'Build-Depends-Arch' => {
         allowed => ALL_SRC,
         dependency => 'normal',
         dep_order => 2,
     },
+    'Build-Depends-Indep' => {
+        allowed => ALL_SRC,
+        dependency => 'normal',
+        dep_order => 3,
+    },
     'Built-Using' => {
         allowed => ALL_PKG,
         dependency => 'union',