Add --arch-only option for apt-get build-dep only only ...

Author: tausq
Date: 2001-11-04 17:09:18 GMT
Add --arch-only option for apt-get build-dep only only process
arch-dependent build-dependencies.

Small change to srcrecord class; bumped minor so number to 3.3

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index d452095cd5296709f657ec1bad86dc838b903655..639079be31f116bc0954ee46fdf261e87b1371a1 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: debsrcrecords.cc,v 1.4 2001/02/20 07:03:17 jgg Exp $
+// $Id: debsrcrecords.cc,v 1.5 2001/11/04 17:09:18 tausq Exp $
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
@@ -47,7 +47,7 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps)
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
 {
    unsigned int I;
    const char *Start, *Stop;
@@ -61,6 +61,9 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
 
    for (I = 0; I < 4; I++) 
    {
+      if (ArchOnly && (I == 1 || I == 3))
+         continue;
+
       if (Sect.Find(fields[I], Start, Stop) == false)
          continue;
       

diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index 477fe4fe3830d2816b518b2bae85e55552ffadf6..a49734795e4d412539bddb0a6985e0e683e138e4 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: debsrcrecords.h,v 1.6 2001/02/20 07:03:17 jgg Exp $
+// $Id: debsrcrecords.h,v 1.7 2001/11/04 17:09:18 tausq Exp $
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
@@ -39,7 +39,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
    virtual string Maintainer() const {return Sect.FindS("Maintainer");};
    virtual string Section() const {return Sect.FindS("Section");};
    virtual const char **Binaries();
-   virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps);
+   virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly);
    virtual unsigned long Offset() {return iOffset;};
    virtual string AsStr() 
    {

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index b07bc99ec592b6ab4e427c9dab6c1a3f6faaa4fe..ed8a607b97e39e02028228198ef6af451796c837 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: init.h,v 1.8 2001/04/22 05:42:52 jgg Exp $
+// $Id: init.h,v 1.9 2001/11/04 17:09:18 tausq Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -18,7 +18,7 @@
 
 // See the makefile
 #define APT_PKG_MAJOR 3
-#define APT_PKG_MINOR 2
+#define APT_PKG_MINOR 3
 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e1b4d6153e47725a546f9fe2788c2d8736d75760..f8cb1ddca599a08ce4557f54278ba4e3a0023503 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -12,7 +12,7 @@ include ../buildlib/defaults.mak
 # The library name, don't forget to update init.h
 LIBRARY=apt-pkg
 LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.2
+MAJOR=3.3
 MINOR=0
 SLIBS=$(PTHREADLIB)
 

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index f63d0934d4485dae9b3e147151688f28a2511f50..4eebf48f1b33ef3a16d591a21883184f93e5d062 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: srcrecords.h,v 1.7 2001/05/07 04:24:08 jgg Exp $
+// $Id: srcrecords.h,v 1.8 2001/11/04 17:09:18 tausq Exp $
 /* ######################################################################
    
    Source Package Records - Allows access to source package records
@@ -72,7 +72,7 @@ class pkgSrcRecords
       virtual string Section() const = 0;
       virtual const char **Binaries() = 0;   // Ownership does not transfer
 
-      virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps) = 0;
+      virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly) = 0;
       static const char *BuildDepType(unsigned char Type);
 
       virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index e7b747e346a34234bb0c9914a43e0468a42a5cbe..76945b805c32f9e4f9e8365d816f44e56da1f72f 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-get.cc,v 1.110 2001/10/02 03:16:28 tausq Exp $
+// $Id: apt-get.cc,v 1.111 2001/11/04 17:09:18 tausq Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -1860,7 +1860,7 @@ bool DoBuildDep(CommandLine &CmdL)
             
       // Process the build-dependencies
       vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps;
-      if (Last->BuildDepends(BuildDeps) == false)
+      if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false)
        return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
    
       if (BuildDeps.size() == 0)
@@ -2119,6 +2119,7 @@ int main(int argc,const char *argv[])
       {0,"trivial-only","APT::Get::Trivial-Only",0},
       {0,"remove","APT::Get::Remove",0},
       {0,"only-source","APT::Get::Only-Source",0},
+      {0,"arch-only","APT::Get::Arch-Only",0},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};

diff --git a/doc/apt-get.8.sgml b/doc/apt-get.8.sgml
index 7d4b7c937afcb77e704e75fa97c08e50183ac15c..85a57b1125da47b432011548ca087f5ded7e4f31 100644 (file)
--- a/doc/apt-get.8.sgml
+++ b/doc/apt-get.8.sgml
@@ -397,6 +397,12 @@
      <literal/APT::Get::Tar-Only/
      </VarListEntry>
      
+     <VarListEntry><term><option/--arch-only/</>
+     <ListItem><Para>
+     Only process architecture-dependent build-dependencies.
+     Configuration Item: <literal/APT::Get::Arch-Only/ 
+     </VarListEntry>
+     
      &apt-commonoptions;
      
    </VariableList>