Просмотр исходного кода

merged r1970 lp:~vorlon/apt/lp.968828

Michael Vogt лет назад: 14
Родитель
Сommit
c307a4f0aa
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      cmdline/apt-get.cc
  2. 4 0
      debian/changelog

+ 1 - 1
cmdline/apt-get.cc

@@ -2864,7 +2864,7 @@ bool DoBuildDep(CommandLine &CmdL)
 	    pkgCache::PkgIterator Pkg;
 
 	    // Cross-Building?
-	    if (StripMultiArch == false)
+	    if (StripMultiArch == false && D->Type != pkgSrcRecords::Parser::BuildDependIndep)
 	    {
 	       size_t const colon = D->Package.find(":");
 	       if (colon != string::npos &&

+ 4 - 0
debian/changelog

@@ -90,6 +90,10 @@ apt (0.9.0~exp1) UNRELEASEDexperimental; urgency=low
       number of auto-removed packages both before and after the list
       of packages (Closes: #665833)
 
+  [ Steve Langasek ]
+  * don't treat build-depends-indep as cross-build-dependencies; we should
+    always install the host arch versions.  LP: #968828.
+  
  -- Michael Vogt <mvo@debian.org>  Wed, 11 Apr 2012 17:53:39 +0200
 
 apt (0.8.16~exp13) experimental; urgency=low