bjam trouble and fix on tru64

From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2004-08-20 10:36:04

Hi!

Currently bjam keep recompiling the static archives on Tru64 because it 
doesn't scan the archives correctly. Tru64 V5 introduced a compressed 
format which has the same ar header but the actual data is kept in a 
compressed format.

Attached is a patch for jam_src/fileunix.c which fixes this.

Markus
 --------------040807020301020503060309 Content-Type: text/plain;
name="patch1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch1"

--- /usr/users/schoepf/net/src/boost/boost-cvs/tools/build/jam_src/fileunix.c	Tue Jun 1 05:42:35 2004
+++ fileunix.c	Fri Aug 20 15:26:50 2004
@@ -236,8 +236,13 @@
if( DEBUG_BINDSCAN )
printf( "scan archive %s\n", archive );

-	while( read( fd, &ar_hdr, SARHDR ) == SARHDR &&
-	!memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) )
+	while( read( fd, &ar_hdr, SARHDR ) == SARHDR
+	&& ! ( memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG )
+#ifdef ARFZMAG
+	/* OSF also has a compressed format */
+	&& memcmp( ar_hdr.ar_fmag, ARFZMAG, SARFMAG )
+#endif
+	) )
{
char lar_name_[257];
char* lar_name = lar_name_ + 1;
 --------------040807020301020503060309--