Fixed sparc compile warnings and added -arch build dirs

Author: jgg
Date: 1999-04-15 02:43:47 GMT
Fixed sparc compile warnings and added -arch build dirs

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 678b10646699aefc2c305673742de701e6f4ffbf..4b1642a3f74415e7c8bfd852735ac7c72eef2911 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.18 1999/03/15 08:10:39 jgg Exp $
+// $Id: acquire-method.cc,v 1.19 1999/04/15 02:43:47 jgg Exp $

 /* ######################################################################
 
    Acquire Method
 /* ######################################################################
 
    Acquire Method


@@ -119,14 +119,14 @@ void pkgAcqMethod::URIStart(FetchResult &Res)
    
    End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
    if (Res.Size != 0)
    
    End += snprintf(S,sizeof(S),"200 URI Start\nURI: %s\n",Queue->Uri.c_str());
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Size: %u\n",Res.Size);
+      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);

    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
                      TimeRFC1123(Res.LastModified).c_str());
    
    if (Res.ResumePoint != 0)
    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
                      TimeRFC1123(Res.LastModified).c_str());
    
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
+      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",

                      Res.ResumePoint);
       
    strcat(End,"\n");
                      Res.ResumePoint);
       
    strcat(End,"\n");


@@ -151,7 +151,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       End += snprintf(End,sizeof(S) - (End - S),"Filename: %s\n",Res.Filename.c_str());
    
    if (Res.Size != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Filename: %s\n",Res.Filename.c_str());
    
    if (Res.Size != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Size: %u\n",Res.Size);
+      End += snprintf(End,sizeof(S) - (End - S),"Size: %lu\n",Res.Size);

    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",
    
    if (Res.LastModified != 0)
       End += snprintf(End,sizeof(S) - (End - S),"Last-Modified: %s\n",


@@ -161,7 +161,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
 
    if (Res.ResumePoint != 0)
       End += snprintf(End,sizeof(S) - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
 
    if (Res.ResumePoint != 0)

-      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %u\n",
+      End += snprintf(End,sizeof(S) - (End - S),"Resume-Point: %lu\n",

                      Res.ResumePoint);
 
    if (Res.IMSHit == true)
                      Res.ResumePoint);
 
    if (Res.IMSHit == true)


@@ -174,7 +174,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
       
       if (Alt->Size != 0)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Filename: %s\n",Alt->Filename.c_str());
       
       if (Alt->Size != 0)

-        End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %u\n",Alt->Size);
+        End += snprintf(End,sizeof(S) - (End - S),"Alt-Size: %lu\n",Alt->Size);

       
       if (Alt->LastModified != 0)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Last-Modified: %s\n",
       
       if (Alt->LastModified != 0)
         End += snprintf(End,sizeof(S) - (End - S),"Alt-Last-Modified: %s\n",

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 25512d249cd973c86a79279bc8c09c5c0a9361d0..d04b67ffaf4ab74598abc4345d6f176d7110cf7c 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -36,7 +36,7 @@ endif
 ifdef BUILD
 BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
 else
 ifdef BUILD
 BUILD_POSSIBLE := $(BUILD) $(BASE)/$(BUILD)
 else

-BUILD_POSSIBLE := $(BASE) $(BASE)/build
+BUILD_POSSIBLE := $(BASE) $(BASE)/build-$(shell uname -m) $(BASE)/build

 endif
 
 BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))
 endif
 
 BUILDX:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak*))

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 485679c1d706d90669d337a57247495147e14692..89a8280c8124e6c38ba981501cdc31774d3ad61d 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acqprogress.cc,v 1.11 1999/03/16 00:43:55 jgg Exp $
+// $Id: acqprogress.cc,v 1.12 1999/04/15 02:43:48 jgg Exp $

 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 


@@ -170,7 +170,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       
       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)
       
       // Add in the short description
       if (I->CurrentItem->Owner->ID != 0)

-        snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,
+        snprintf(S,End-S," [%lx %s",I->CurrentItem->Owner->ID,

                  I->CurrentItem->ShortDesc.c_str());
       else
         snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
                  I->CurrentItem->ShortDesc.c_str());
       else
         snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());


@@ -185,7 +185,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
             
       // Add the current progress
       if (Mode == Long)
             
       // Add the current progress
       if (Mode == Long)

-        snprintf(S,End-S," %u",I->CurrentSize);
+        snprintf(S,End-S," %lu",I->CurrentSize);

       else
       {
         if (Mode == Medium || I->TotalSize == 0)
       else
       {
         if (Mode == Medium || I->TotalSize == 0)


@@ -197,10 +197,10 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
       {
         if (Mode == Short)
       if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
       {
         if (Mode == Short)

-           snprintf(S,End-S," %u%%",
+           snprintf(S,End-S," %lu%%",

                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
         else
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
         else

-           snprintf(S,End-S,"/%sb %u%%",SizeToStr(I->TotalSize).c_str(),
+           snprintf(S,End-S,"/%sb %lu%%",SizeToStr(I->TotalSize).c_str(),

                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);