diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-04-05 17:59:37 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-04-05 17:59:37 -0700 |
| commit | 271bd589a5af63252590fadfe7b5f46a425f07fe (patch) | |
| tree | 78035ae38ffee7922c781ad3d4abc1c1b2722fd0 /cmdline/apt-get.cc | |
| parent | dfcf5617db6ed3e5a1878aa4f4332e64cec29668 (diff) | |
For cross-build-dependencies, Architecture: all packages should be
treated as implicitly Multi-Arch: foreign, because either they *are*
M-A: foreign when used as a build-dependency, or they need to be updated
to not be Architecture: all; and since cross-build-deps are new
functionality in apt, we can safely make this change without breaking
existing systems. Closes: #666772.
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 45405e761..7c7e94eba 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2863,7 +2863,7 @@ bool DoBuildDep(CommandLine &CmdL) if ((BADVER(Ver)) == false) { string forbidden; - if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) + if (Ver->MultiArch == pkgCache::Version::None) { if (colon == string::npos) { @@ -2878,7 +2878,7 @@ bool DoBuildDep(CommandLine &CmdL) forbidden = "Multi-Arch: same"; // :native gets the buildArch } - else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) + else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All) { if (colon != string::npos) forbidden = "Multi-Arch: foreign"; |