[pkg-boost-commits] r14373 - in boost/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Sat Feb 21 17:16:29 UTC 2009
Author: smr
Date: 2009-02-21 17:16:29 +0000 (Sat, 21 Feb 2009)
New Revision: 14373
Removed:
boost/trunk/debian/patches/avoid-PATH_MAX.patch
boost/trunk/debian/patches/gcc43-date_time.patch
boost/trunk/debian/patches/gcc43-path_name_check.patch
boost/trunk/debian/patches/jam-hardening.patch
boost/trunk/debian/patches/math-c99.patch
boost/trunk/debian/patches/suppress-compiler-warnings.patch
boost/trunk/debian/patches/system-error-code.patch
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/patches/jam-wall-clean.patch
boost/trunk/debian/patches/kfreebsd-jam.patch
boost/trunk/debian/patches/series
Log:
Minimal tweaks to patches to get full series to apply. Need to revisit add-disable-long-double.patch.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/changelog 2009-02-21 17:16:29 UTC (rev 14373)
@@ -2,9 +2,25 @@
* New upstream.
- update control appropriately.
+
+ * patches/math-c99.patch:
+ * patches/jam-hardening.patch:
+ * patches/avoid-PATH_MAX.patch:
+ * patches/suppress-compiler-warnings.patch:
+ * patches/gcc43-date_time.patch:
+ * patches/gcc43-path_name_check.patch:
+ * patches/system-error-code.patch: Removed. Applied upstream.
+
+ * patches/jam-wall-clean.patch: Updated; partially applied upstream.
+ * patches/kfreebsd-jam.patch: Refreshed.
+
+ * patches/series: Modified to account for removed patches. Temporarily
+ removed add-disable-long-double.patch; a variant applied upstream, but
+ my recollection is that it doesn't solve the problem. Needs further
+ investigation.
+
+ -- Steve M. Robbins <smr at debian.org> Sat, 21 Feb 2009 11:12:24 -0600
- -- Steve M. Robbins <smr at debian.org> Mon, 16 Feb 2009 18:36:39 -0600
-
boost1.37 (1.37.0-5) unstable; urgency=low
* README.Debian:
Deleted: boost/trunk/debian/patches/avoid-PATH_MAX.patch
===================================================================
--- boost/trunk/debian/patches/avoid-PATH_MAX.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/avoid-PATH_MAX.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,51 +0,0 @@
-# Fix for http://bugs.debian.org/487343
-# Reported upstream as http://svn.boost.org/trac/boost/ticket/2206
-# - fixed in SVN changeset 48993
-
---- boost1.35-1.35.0.orig/tools/jam/src/pwd.c
-+++ boost1.35-1.35.0/tools/jam/src/pwd.c
-@@ -2,6 +2,9 @@
- /* Software License, Version 1.0. (See accompanying */
- /* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */
-
-+/* Define _GNU_SOURCE to expose get_current_dir_name() */
-+#define _GNU_SOURCE
-+
- #include "jam.h"
- #include "lists.h"
- #include "newstr.h"
-@@ -24,7 +27,9 @@
- /* The current directory can't change in bjam, so optimize this to cache
- ** the result.
- */
-+#ifndef __GLIBC__
- static char pwd_buffer[PATH_MAX];
-+#endif
- static char * pwd_result = NULL;
-
-
-@@ -33,11 +38,16 @@
- {
- if (!pwd_result)
- {
-+#ifdef __GLIBC__
-+ if ((pwd_result = get_current_dir_name()) == NULL)
-+#else
- if (getcwd(pwd_buffer, sizeof(pwd_buffer)) == NULL)
-+#endif
- {
- perror("can not get current directory");
- return L0;
- }
-+#ifndef __GLIBC__
- else
- {
- #ifdef NT
-@@ -46,6 +56,7 @@
- pwd_result = newstr(pwd_buffer);
- #endif
- }
-+#endif
- }
- return list_new(L0, pwd_result);
- }
Deleted: boost/trunk/debian/patches/gcc43-date_time.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-date_time.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/gcc43-date_time.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,13 +0,0 @@
-Patch from http://svn.boost.org/trac/boost/ticket/1615
-
---- boost1.36-1.36.0.orig/boost/date_time/tz_db_base.hpp
-+++ boost1.36-1.36.0/boost/date_time/tz_db_base.hpp
-@@ -158,8 +158,8 @@
- typedef typename time_zone_type::base_type time_zone_base_type;
- typedef typename time_zone_type::time_duration_type time_duration_type;
- typedef time_zone_names_base<char_type> time_zone_names;
-- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-+ typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
- typedef std::basic_string<char_type> string_type;
-
- //! Constructs an empty database
Deleted: boost/trunk/debian/patches/gcc43-path_name_check.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-path_name_check.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/gcc43-path_name_check.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,12 +0,0 @@
-Reported upstream as http://svn.boost.org/trac/boost/ticket/2210
-
---- boost1.36-1.36.0.orig/tools/inspect/path_name_check.cpp
-+++ boost1.36-1.36.0/tools/inspect/path_name_check.cpp
-@@ -15,6 +15,7 @@
- #include <string>
- #include <algorithm>
- #include <cctype>
-+#include <cstring>
-
- using std::string;
-
Deleted: boost/trunk/debian/patches/jam-hardening.patch
===================================================================
--- boost/trunk/debian/patches/jam-hardening.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/jam-hardening.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,80 +0,0 @@
-From Kees Cook, Debian BTS #505734
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2527
-
---- boost1.37-1.37.0.orig/tools/jam/src/compile.c
-+++ boost1.37-1.37.0/tools/jam/src/compile.c
-@@ -1404,7 +1404,7 @@
- i = (level+1)*2;
- while ( i > 35 )
- {
-- printf( indent );
-+ printf( "%s", indent );
- i -= 35;
- }
-
---- boost1.37-1.37.0.orig/tools/jam/src/make1.c
-+++ boost1.37-1.37.0/tools/jam/src/make1.c
-@@ -1018,7 +1018,7 @@
- list_sublist( ns, start, chunk ),
- list_new( L0, newstr( "%" ) ) );
-
-- printf( cmd->buf );
-+ printf( "%s", cmd->buf );
-
- exit( EXITBAD );
- }
---- boost1.37-1.37.0.orig/tools/jam/src/output.c
-+++ boost1.37-1.37.0/tools/jam/src/output.c
-@@ -20,7 +20,7 @@
- while ( *data )
- {
- size_t len = strcspn(data,"\r");
-- fwrite(data,len,1,io);
-+ do { if (fwrite(data,len,1,io)) {} } while (0);
- data += len;
- if ( *data == '\r' ) ++data;
- }
---- boost1.37-1.37.0.orig/tools/jam/src/variable.c
-+++ boost1.37-1.37.0/tools/jam/src/variable.c
-@@ -416,8 +416,18 @@
- }
- if ( output_0 < output_1 )
- {
-- if ( out_file ) fwrite(output_0,output_1-output_0,1,out_file);
-- if ( out_debug ) fwrite(output_0,output_1-output_0,1,stdout);
-+ if ( out_file ) {
-+ if ( fwrite(output_0,output_1-output_0,1,out_file) < 1 ) {
-+ printf( "failed to write output file!\n" );
-+ exit( EXITBAD );
-+ }
-+ }
-+ if ( out_debug ) {
-+ if ( fwrite(output_0,output_1-output_0,1,stdout) < 1 ) {
-+ printf( "failed to write output to stdout!\n" );
-+ exit( EXITBAD );
-+ }
-+ }
- }
- output_0 = output_1;
-
-@@ -457,8 +467,18 @@
- }
- else if ( output_0 < output_1 )
- {
-- if ( out_file ) fwrite(output_0,output_1-output_0,1,out_file);
-- if ( out_debug ) fwrite(output_0,output_1-output_0,1,stdout);
-+ if ( out_file ) {
-+ if ( fwrite(output_0,output_1-output_0,1,out_file) < 1 ) {
-+ printf( "failed to write output file!\n" );
-+ exit( EXITBAD );
-+ }
-+ }
-+ if ( out_debug ) {
-+ if ( fwrite(output_0,output_1-output_0,1,stdout) < 1 ) {
-+ printf( "failed to write output to stdout!\n" );
-+ exit( EXITBAD );
-+ }
-+ }
- }
-
- in = output_1;
Modified: boost/trunk/debian/patches/jam-wall-clean.patch
===================================================================
--- boost/trunk/debian/patches/jam-wall-clean.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/jam-wall-clean.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,544 +1,54 @@
-# Reported upstream as http://svn.boost.org/trac/boost/ticket/2207
-
---- boost1.35-1.35.0.orig/tools/jam/src/builtins.c
-+++ boost1.35-1.35.0/tools/jam/src/builtins.c
-@@ -157,7 +157,6 @@
- builtin_flags, T_FLAG_TEMP, 0 ) );
+--- boost1.38-1.38.0.orig/tools/jam/src/expand.c
++++ boost1.38-1.38.0/tools/jam/src/expand.c
+@@ -82,7 +82,7 @@
+ int depth;
- {
-- char * args[] = { "targets", "*", 0 };
- bind_builtin(
- "ISFILE",
- builtin_flags, T_FLAG_ISFILE, 0 );
-@@ -1157,7 +1156,7 @@
- void backtrace( FRAME *frame )
- {
- if ( !frame ) return;
-- while ( frame = frame->prev )
-+ while ( ( frame = frame->prev ) )
- {
- backtrace_line( frame );
- }
-@@ -1368,7 +1367,6 @@
- *(current+2) = '\1';
- ++dotdots;
- } else if (dotdots) {
-- char* p = current;
- memset(current, '\1', end-current+1);
- --dotdots;
- }
---- boost1.35-1.35.0.orig/tools/jam/src/class.c
-+++ boost1.35-1.35.0/tools/jam/src/class.c
-@@ -52,7 +52,6 @@
- RULE* ir2;
- struct import_base_data* d = (struct import_base_data*)d_;
- string qualified_name[1];
-- int basename_lenght = strlen(d->base_name)+1;
+ if ( DEBUG_VAREXP )
+- printf( "expand '%.*s'\n", end - in, in );
++ printf( "expand '%.*s'\n", (int)(end - in), in );
- string_new(qualified_name);
- string_append(qualified_name, d->base_name);
-@@ -67,7 +66,7 @@
-
- /* If we're importing class method, localize it. */
- if (r->module == d->base_module
-- || r->module->class_module && r->module->class_module == d->base_module) {
-+ || ( r->module->class_module && r->module->class_module == d->base_module ) ) {
- ir1->module = ir2->module = d->class_module;
+ /* This gets a lot of cases: $(<) and $(>). */
+ if
+--- boost1.38-1.38.0.orig/tools/jam/src/class.c
++++ boost1.38-1.38.0/tools/jam/src/class.c
+@@ -119,7 +119,7 @@
}
-
-@@ -107,7 +106,7 @@
- printf("Class %s already defined\n", xname->string);
- abort();
- } else {
-- hashenter(classes, (HASHDATA**)&pp);
-+ (void)hashenter(classes, (HASHDATA**)&pp);
- }
- check_defined(bases);
-
---- boost1.35-1.35.0.orig/tools/jam/src/compile.c
-+++ boost1.35-1.35.0/tools/jam/src/compile.c
-@@ -326,7 +326,7 @@
- {
- LIST *r = 0;
- LIST *l;
-- while ( l = parse_evaluate( p->left, frame ) )
-+ while ( ( l = parse_evaluate( p->left, frame ) ) )
+ else
{
- list_free( l );
- if( r ) list_free( r );
-@@ -800,12 +800,13 @@
- return locals;
- }
-
--static int python_instance_number = 0;
--
- RULE *
- enter_rule( char *rulename, module_t *target_module );
-
- #ifdef HAVE_PYTHON
-+
-+static int python_instance_number = 0;
-+
- static LIST*
- call_python_function(RULE* r, FRAME* frame)
- {
---- boost1.35-1.35.0.orig/tools/jam/src/debug.c
-+++ boost1.35-1.35.0/tools/jam/src/debug.c
-@@ -111,7 +111,7 @@
- profile_total.cumulative += p->net;
- profile_total.memory += p->memory;
+- hashenter( classes, (HASHDATA * *)&pp );
++ (void)hashenter( classes, (HASHDATA * *)&pp );
}
-- printf("%10d %12.6f %12.6f %12.8f %10d %10d %s\n",
-+ printf("%10ld %12.6f %12.6f %12.8f %10ld %10ld %s\n",
- p->num_entries,
- cumulative,net,q,
- p->memory, mem_each,
-#
-# Pointer difference is long int on amd64; cast to int
---- boost1.35-1.35.0.orig/tools/jam/src/expand.c
-+++ boost1.35-1.35.0/tools/jam/src/expand.c
-@@ -87,7 +87,7 @@
- int depth;
+ check_defined( bases );
- if( DEBUG_VAREXP )
-- printf( "expand '%.*s'\n", end - in, in );
-+ printf( "expand '%.*s'\n", (int) (end - in), in );
-
- /* This gets alot of cases: $(<) and $(>) */
-
-@@ -276,7 +276,7 @@
- string_copy( variable, vars->string );
- varname = variable->value;
-
-- if( colon = strchr( varname, MAGIC_COLON ) )
-+ if( ( colon = strchr( varname, MAGIC_COLON ) ) )
- {
- string_truncate( variable, colon - varname );
- var_edit_parse( colon + 1, &edits );
-@@ -285,7 +285,7 @@
- /* Look for [x-y] subscripting */
- /* sub1 and sub2 are x and y. */
-
-- if ( bracket = strchr( varname, MAGIC_LEFT ) )
-+ if ( ( bracket = strchr( varname, MAGIC_LEFT ) ) )
- {
- /*
- ** Make all syntax errors in [] subscripting
-@@ -607,7 +607,7 @@
- fp->ptr = "";
- fp->len = 0;
- }
-- else if( p = strchr( mods, MAGIC_COLON ) )
-+ else if( ( p = strchr( mods, MAGIC_COLON ) ) )
- {
- *p = 0;
- fp->ptr = ++mods;
---- boost1.35-1.35.0.orig/tools/jam/src/fileunix.c
-+++ boost1.35-1.35.0/tools/jam/src/fileunix.c
-@@ -170,10 +170,8 @@
- printf( "scan directory %s\n", dir );
-
- string_new( filename );
-- while( dirent = readdir( dd ) )
-+ while( ( dirent = readdir( dd ) ) )
- {
-- file_info_t * ff = 0;
--
- # ifdef old_sinix
- /* Broken structure definition on sinix. */
- f.f_base.ptr = dirent->d_name - 2;
-#
-# Hunk 3: sizeof( ITEM ** ) is long unsigned int on amd64 and s390
-# cast to int.
---- boost1.35-1.35.0.orig/tools/jam/src/hash.c
-+++ boost1.35-1.35.0/tools/jam/src/hash.c
-@@ -336,7 +336,7 @@
- hp->items.size = sizeof( struct hashhdr ) + ALIGNED( datalen );
- hp->items.list = -1;
- hp->items.nel = 0;
-- hp->inel = /* */ 11 /*/ 47 /* */;
-+ hp->inel = /* */ 11 /* 47 */;
- hp->name = name;
-
- return hp;
-@@ -412,7 +412,7 @@
-
- for( i = nel; i > 0; i-- )
- {
-- if( here = ( *tab++ != (ITEM *)0 ) )
-+ if( ( here = ( *tab++ != (ITEM *)0 ) ) )
- count++;
- if( here && !run )
- sets++;
-@@ -425,6 +425,6 @@
- hp->items.nel,
- hp->tab.nel,
- hp->items.nel * hp->items.size / 1024,
-- hp->tab.nel * sizeof( ITEM ** ) / 1024,
-+ hp->tab.nel * (int) sizeof( ITEM ** ) / 1024,
- (float)count / (float)sets );
- }
---- boost1.35-1.35.0.orig/tools/jam/src/hdrmacro.c
-+++ boost1.35-1.35.0/tools/jam/src/hdrmacro.c
-@@ -46,8 +46,6 @@
- * just to invoke a rule.
- */
-
--static LIST *header_macros1( LIST *l, char *file, int rec, regexp *re[] );
--
- /* this type is used to store a dictionary of file header macros */
- typedef struct header_macro
- {
---- boost1.35-1.35.0.orig/tools/jam/src/jam.c
-+++ boost1.35-1.35.0/tools/jam/src/jam.c
-@@ -308,7 +308,7 @@
-
- /* Turn on/off debugging */
-
-- for( n = 0; s = getoptval( optv, 'd', n ); n++ )
-+ for( n = 0; ( s = getoptval( optv, 'd', n ) ); n++ )
+--- boost1.38-1.38.0.orig/tools/jam/src/modules.c
++++ boost1.38-1.38.0/tools/jam/src/modules.c
+@@ -143,7 +143,7 @@
{
- int i;
+ char * s = module_names->string;
+ char * * ss = &s;
+- hashenter( h, (HASHDATA * *)&ss );
++ (void)hashenter( h, (HASHDATA * *)&ss );
+ }
-@@ -426,7 +426,7 @@
-
- /* Load up variables set on command line. */
-
-- for( n = 0; s = getoptval( optv, 's', n ); n++ )
-+ for( n = 0; ( s = getoptval( optv, 's', n ) ); n++ )
- {
- char *symv[2];
- symv[0] = s;
-@@ -469,7 +469,7 @@
- {
- FRAME frame[1];
- frame_init( frame );
-- for( n = 0; s = getoptval( optv, 'f', n ); n++ )
-+ for( n = 0; ( s = getoptval( optv, 'f', n ) ); n++ )
- parse_file( s, frame );
-
- if( !n )
-@@ -480,12 +480,12 @@
-
- /* Manually touch -t targets */
-
-- for( n = 0; s = getoptval( optv, 't', n ); n++ )
-+ for( n = 0; ( s = getoptval( optv, 't', n ) ); n++ )
- touchtarget( s );
-
- /* If an output file is specified, set globs.cmdout to that */
-
-- if( s = getoptval( optv, 'o', 0 ) )
-+ if( ( s = getoptval( optv, 'o', 0 ) ) )
- {
- if( !( globs.cmdout = fopen( s, "w" ) ) )
- {
---- boost1.35-1.35.0.orig/tools/jam/src/make.c
-+++ boost1.35-1.35.0/tools/jam/src/make.c
-@@ -201,7 +201,7 @@
- if (DEBUG_FATE)
- {
- printf( "fate change %s from %s to %s (as dependent of %s)\n",
-- p->name, target_fate[fate0], target_fate[p->fate], t->name);
-+ p->name, target_fate[(int)fate0], target_fate[(int)p->fate], t->name);
- }
-
- /* If we're done visiting it, go back and make sure its
-@@ -226,7 +226,7 @@
- {
- if (DEBUG_FATE)
- printf( "fate change %s from %s to %s (by rebuild)\n",
-- r->name, target_fate[r->fate], target_fate[T_FATE_REBUILD]);
-+ r->name, target_fate[(int)r->fate], target_fate[(int)T_FATE_REBUILD]);
-
- /* Force rebuild it */
- r->fate = T_FATE_REBUILD;
-@@ -251,7 +251,7 @@
- COUNTS *counts, /* for reporting */
- int anyhow ) /* forcibly touch all (real) targets */
- {
-- TARGETS *c, *d, *incs;
-+ TARGETS *c, *incs;
- TARGET *ptime = t;
- time_t last, leaf, hlast;
- int fate;
-@@ -365,7 +365,7 @@
- case T_BIND_MISSING:
- case T_BIND_PARENTS:
- printf( "time\t--\t%s%s: %s\n",
-- spaces( depth ), t->name, target_bind[ t->binding ] );
-+ spaces( depth ), t->name, target_bind[ (int)t->binding ] );
- break;
-
- case T_BIND_EXISTS:
-@@ -447,7 +447,7 @@
- if( fate < c->target->fate )
- printf( "fate change %s from %s to %s by dependency %s\n",
- t->name,
-- target_fate[fate], target_fate[c->target->fate],
-+ target_fate[(int)fate], target_fate[(int)c->target->fate],
- c->target->name);
- #endif
-
-@@ -571,7 +571,8 @@
- fate = T_FATE_STABLE;
- }
- #ifdef OPT_GRAPH_DEBUG_EXT
-- if( DEBUG_FATE && fate != savedFate )
-+ if( DEBUG_FATE && ( fate != savedFate ) )
-+ {
- if( savedFate == T_FATE_STABLE )
- printf( "fate change %s set to %s%s\n",
- t->name, target_fate[fate],
-@@ -580,6 +581,7 @@
- printf( "fate change %s from %s to %s%s\n",
- t->name, target_fate[savedFate], target_fate[fate],
- oldTimeStamp ? " (by timestamp)" : "" );
-+ }
- #endif
-
- /* Step 4e: handle missing files */
-@@ -667,7 +669,7 @@
-
- if( DEBUG_MAKEPROG )
- printf( "made%s\t%s\t%s%s\n",
-- flag, target_fate[ t->fate ],
-+ flag, target_fate[ (int)t->fate ],
- spaces( depth ), t->name );
-
- /* We don't have DEBUG_CAUSES.
-@@ -776,7 +778,7 @@
- for( c = t->depends; c; c = c->next )
- {
- printf( " %s : Depends on %s (%s)", spaces(depth),
-- target_name(c->target), target_fate[ c->target->fate ] );
-+ target_name(c->target), target_fate[ (int)c->target->fate ] );
- if (c->target->time == t->time)
- printf( " (max time)");
- printf("\n");
---- boost1.35-1.35.0.orig/tools/jam/src/make1.c
-+++ boost1.35-1.35.0/tools/jam/src/make1.c
-@@ -65,7 +65,7 @@
-
- # include <stdlib.h>
-
--#if defined(sun) || defined(__sun)
-+#if defined(sun) || defined(__sun) || defined(linux)
- #include <unistd.h> /* for unlink */
- #endif
-
-@@ -506,15 +506,15 @@
- {
- char *rule_name = 0;
- char *target = 0;
-- if( DEBUG_MAKEQ ||
-- ! ( cmd->rule->actions->flags & RULE_QUIETLY ) && DEBUG_MAKE)
-+ if( DEBUG_MAKEQ ||
-+ ( ! ( cmd->rule->actions->flags & RULE_QUIETLY ) && DEBUG_MAKE ) )
- {
-- rule_name = cmd->rule->name;
-- target = lol_get(&cmd->args, 0)->string;
-- if ( globs.noexec )
-- {
-- out_action(rule_name,target,cmd->buf,"","",EXIT_OK);
-- }
-+ rule_name = cmd->rule->name;
-+ target = lol_get(&cmd->args, 0)->string;
-+ if ( globs.noexec )
-+ {
-+ out_action(rule_name,target,cmd->buf,"","",EXIT_OK);
-+ }
- }
-
- if( globs.noexec )
---- boost1.35-1.35.0.orig/tools/jam/src/modules.c
-+++ boost1.35-1.35.0/tools/jam/src/modules.c
-@@ -135,7 +135,7 @@
- char* s = module_names->string;
- char** ss = &s;
-
-- hashenter(h, (HASHDATA**)&ss);
-+ (void)hashenter(h, (HASHDATA**)&ss);
+ PROFILE_EXIT( IMPORT_MODULE );
+--- boost1.38-1.38.0.orig/tools/jam/src/search.c
++++ boost1.38-1.38.0/tools/jam/src/search.c
+@@ -213,7 +213,7 @@
+ /* CONSIDER: we probably should issue a warning is another file
+ is explicitly bound to the same location. This might break
+ compatibility, though. */
+- hashenter( explicit_bindings, (HASHDATA * *)&ba );
++ (void)hashenter( explicit_bindings, (HASHDATA * *)&ba );
}
-
- PROFILE_EXIT(IMPORT_MODULE);
---- boost1.35-1.35.0.orig/tools/jam/src/modules/order.c
-+++ boost1.35-1.35.0/tools/jam/src/modules/order.c
-@@ -77,7 +77,7 @@
- LIST* arg = lol_get( frame->args, 0 );
- LIST* tmp;
- LIST* result = 0;
-- int src, dst;
-+ int src;
- /* We need to create a graph of order dependencies between
- the passed objects. We assume that there are no duplicates
---- boost1.35-1.35.0.orig/tools/jam/src/modules/property-set.c
-+++ boost1.35-1.35.0/tools/jam/src/modules/property-set.c
-@@ -45,7 +45,9 @@
- {
- LIST* properties = lol_get( frame->args, 0 );
- LIST* sorted = 0;
-+#if 0
- LIST* order_sensitive = 0;
-+#endif
- LIST* unique;
- LIST* tmp;
- LIST* val;
---- boost1.35-1.35.0.orig/tools/jam/src/native.c
-+++ boost1.35-1.35.0/tools/jam/src/native.c
-@@ -32,7 +32,7 @@
+ /* prepare a call to BINDRULE if the variable is set */
+--- boost1.38-1.38.0.orig/tools/jam/src/native.c
++++ boost1.38-1.38.0/tools/jam/src/native.c
+@@ -31,6 +31,6 @@
}
- n.procedure = parse_make( f, P0, P0, P0, C0, C0, 0 );
+ n.procedure = parse_make( f, P0, P0, P0, C0, C0, 0 );
n.version = version;
- hashenter(m->native_rules, (HASHDATA**)&np);
+ (void)hashenter(m->native_rules, (HASHDATA**)&np);
}
}
-
---- boost1.35-1.35.0.orig/tools/jam/src/output.c
-+++ boost1.35-1.35.0/tools/jam/src/output.c
-@@ -67,7 +67,7 @@
- if ( action )
- {
- /* but only output for non-quietly actions */
-- fprintf(bjam_out, "%d second time limit exceeded\n", globs.timeout);
-+ fprintf(bjam_out, "%ld second time limit exceeded\n", globs.timeout);
- }
- break;
- }
---- boost1.35-1.35.0.orig/tools/jam/src/pathunix.c
-+++ boost1.35-1.35.0/tools/jam/src/pathunix.c
-@@ -124,7 +124,7 @@
- p = 0;
- q = file;
-
-- while( q = (char *)memchr( q, '.', end - q ) )
-+ while( ( q = (char *)memchr( q, '.', end - q ) ) )
- p = q++;
-
- if( p )
---- boost1.35-1.35.0.orig/tools/jam/src/rules.c
-+++ boost1.35-1.35.0/tools/jam/src/rules.c
-@@ -342,8 +342,6 @@
- TARGETS *chain,
- TARGETS *targets )
- {
-- TARGETS *c;
--
- if( !targets )
- return chain;
- else if( !chain )
---- boost1.35-1.35.0.orig/tools/jam/src/search.c
-+++ boost1.35-1.35.0/tools/jam/src/search.c
-@@ -115,7 +115,7 @@
- f->f_grist.ptr = 0;
- f->f_grist.len = 0;
-
-- if( varlist = var_get( "LOCATE" ) )
-+ if( ( varlist = var_get( "LOCATE" ) ) )
- {
- f->f_root.ptr = varlist->string;
- f->f_root.len = strlen( varlist->string );
-@@ -130,7 +130,7 @@
- timestamp( buf->value, time );
- found = 1;
- }
-- else if( varlist = var_get( "SEARCH" ) )
-+ else if( ( varlist = var_get( "SEARCH" ) ) )
- {
- while( varlist )
- {
-@@ -198,7 +198,7 @@
- /* CONSIDER: we probably should issue a warning is another file
- is explicitly bound to the same location. This might break
- compatibility, though. */
-- hashenter(explicit_bindings, (HASHDATA**)&ba);
-+ (void)hashenter(explicit_bindings, (HASHDATA**)&ba);
- }
-
- /* prepare a call to BINDRULE if the variable is set */
---- boost1.35-1.35.0.orig/tools/jam/src/timestamp.c
-+++ boost1.35-1.35.0/tools/jam/src/timestamp.c
-@@ -75,10 +75,10 @@
- PATHNAME f1, f2;
- BINDING binding, *b = &binding;
- string buf[1];
-- string path;
-- char *p;
-
- # ifdef DOWNSHIFT_PATHS
-+ string path;
-+ char *p;
-
- string_copy( &path, target );
- p = path.value;
---- boost1.35-1.35.0.orig/tools/jam/src/variable.c
-+++ boost1.35-1.35.0/tools/jam/src/variable.c
-@@ -109,7 +109,7 @@
-
- if( ( val = strchr( *e, '=' ) ) || ( val = *e + strlen( *e ) ) )
- # else
-- if( val = strchr( *e, '=' ) )
-+ if( ( val = strchr( *e, '=' ) ) )
- # endif
- {
- LIST *l = L0;
---- boost1.35-1.35.0.orig/tools/jam/src/hcache.c
-+++ boost1.35-1.35.0/tools/jam/src/hcache.c
-@@ -162,7 +162,7 @@
- {
- if (!s)
- s = "";
-- fprintf(f, "%lu\t%s\n", strlen(s), s);
-+ fprintf(f, "%zu\t%s\n", strlen(s), s);
- }
-
- void
-@@ -314,10 +314,10 @@
- else if (c->age > maxage)
- continue;
-
-- sprintf(includes_count_str, "%lu", list_length(c->includes));
-- sprintf(hdrscan_count_str, "%lu", list_length(c->hdrscan));
-+ sprintf(includes_count_str, "%d", list_length(c->includes));
-+ sprintf(hdrscan_count_str, "%d", list_length(c->hdrscan));
- sprintf(time_str, "%lu", c->time);
-- sprintf(age_str, "%lu", c->age);
-+ sprintf(age_str, "%d", c->age);
-
- write_netstring(f, CACHE_RECORD_HEADER);
- write_netstring(f, c->boundname);
---- boost1.35-1.35.0.orig/tools/jam/src/headers.c
-+++ boost1.35-1.35.0/tools/jam/src/headers.c
-@@ -60,7 +60,6 @@
- {
- LIST *hdrscan;
- LIST *hdrrule;
-- LIST *headlist = 0;
- regexp *re[ MAXINC ];
- int rec = 0;
-
-@@ -88,7 +87,10 @@
- #ifdef OPT_HEADER_CACHE_EXT
- lol_add( frame->args, hcache( t, rec, re, hdrscan ) );
- #else
-- lol_add( frame->args, headers1( headlist, t->boundname, rec, re ) );
-+ {
-+ LIST *headlist = 0;
-+ lol_add( frame->args, headers1( headlist, t->boundname, rec, re ) );
-+ }
- #endif
-
- if( lol_get( frame->args, 1 ) )
---- boost1.35-1.35.0.orig/tools/jam/src/regexp.c
-+++ boost1.35-1.35.0/tools/jam/src/regexp.c
-@@ -307,7 +307,7 @@
- register char *ret;
- register char *br;
- register char *ender;
-- register int parno;
-+ register int parno = 0;
- int flags;
-
- *flagp = HASWIDTH; /* Tentatively. */
Modified: boost/trunk/debian/patches/kfreebsd-jam.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-jam.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/kfreebsd-jam.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,15 +1,15 @@
Reported upstream as https://svn.boost.org/trac/boost/ticket/2596
---- boost1.36-1.36.0.orig/tools/jam/src/jam.h
-+++ boost1.36-1.36.0/tools/jam/src/jam.h
-@@ -418,6 +418,10 @@
- # include <stdlib.h>
- # endif
+--- boost1.38-1.38.0.orig/tools/jam/src/jam.h
++++ boost1.38-1.38.0/tools/jam/src/jam.h
+@@ -419,6 +419,10 @@
+ #include <stdlib.h>
+ #endif
-+# ifdef __GLIBC__
-+# include <unistd.h>
-+# endif
++#ifdef __GLIBC__
++# include <unistd.h>
++#endif
+
- # if !defined(OS_BSDI) && \
- !defined(OS_FREEBSD) && \
- !defined(OS_DRAGONFLYBSD) && \
+ #if !defined( OS_BSDI ) && \
+ !defined( OS_FREEBSD ) && \
+ !defined( OS_DRAGONFLYBSD ) && \
Deleted: boost/trunk/debian/patches/math-c99.patch
===================================================================
--- boost/trunk/debian/patches/math-c99.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/math-c99.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,71 +0,0 @@
-Fix for https://svn.boost.org/trac/boost/ticket/2526
-From https://svn.boost.org/trac/boost/changeset/50055/trunk/boost
-
-
---- boost1.37-1.37.0.orig/boost/math/special_functions/expm1.hpp
-+++ boost1.37-1.37.0/boost/math/special_functions/expm1.hpp
-@@ -233,7 +233,7 @@
- #endif
-
- #if defined(BOOST_HAS_EXPM1) && !(defined(__osf__) && defined(__DECCXX_VER))
--# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
-+# ifdef BOOST_MATH_USE_C99
- inline float expm1(float x, const policies::policy<>&){ return ::expm1f(x); }
- inline long double expm1(long double x, const policies::policy<>&){ return ::expm1l(x); }
- #else
---- boost1.37-1.37.0.orig/boost/math/special_functions/fpclassify.hpp
-+++ boost1.37-1.37.0/boost/math/special_functions/fpclassify.hpp
-@@ -165,7 +165,9 @@
- {
- return BOOST_FPCLASSIFY_PREFIX fpclassify(t);
- }
--#if !defined(__CYGWIN__) && !defined(__HP_aCC) && !defined(BOOST_INTEL) && !defined(BOOST_NO_NATIVE_LONG_DOUBLE_FP_CLASSIFY)
-+#if !defined(__CYGWIN__) && !defined(__HP_aCC) && !defined(BOOST_INTEL) \
-+ && !defined(BOOST_NO_NATIVE_LONG_DOUBLE_FP_CLASSIFY) \
-+ && !(defined(__GNUC__) && !defined(BOOST_MATH_USE_C99))
- // The native fpclassify broken for long doubles with aCC
- // use portable one instead....
- inline int fpclassify BOOST_NO_MACRO_EXPAND(long double t)
---- boost1.37-1.37.0.orig/boost/math/special_functions/log1p.hpp
-+++ boost1.37-1.37.0/boost/math/special_functions/log1p.hpp
-@@ -316,9 +316,7 @@
- #endif
-
- #if defined(BOOST_HAS_LOG1P) && !(defined(__osf__) && defined(__DECCXX_VER))
--# if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)) \
-- || ((defined(linux) || defined(__linux) || defined(__linux__)) && !defined(__SUNPRO_CC)) \
-- || (defined(__hpux) && !defined(__hppa))
-+# ifdef BOOST_MATH_USE_C99
- template <class Policy>
- inline float log1p(float x, const Policy& pol)
- {
---- boost1.37-1.37.0.orig/boost/math/tools/config.hpp
-+++ boost1.37-1.37.0/boost/math/tools/config.hpp
-@@ -70,6 +70,18 @@
- # define BOOST_MATH_NO_DEDUCED_FUNCTION_POINTERS
- #endif
-
-+#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901))
-+# define BOOST_MATH_USE_C99
-+#endif
-+
-+#if (defined(__hpux) && !defined(__hppa))
-+# define BOOST_MATH_USE_C99
-+#endif
-+
-+#if defined(__GNUC__) && defined(_GLIBCXX_USE_C99)
-+# define BOOST_MATH_USE_C99
-+#endif
-+
- #if defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) || BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
-
- # include "boost/type.hpp"
-@@ -219,7 +231,7 @@
- } // namespace tools
- }} // namespace boost namespace math
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__QNX__) || defined(__IBMCPP__)
-
- #include <fenv.h>
-
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/series 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,19 +1,11 @@
function-template.patch
-math-c99.patch
atomic_count.patch
atomic_count_gcc.patch
sp_counted_base.patch
-jam-hardening.patch
endian.patch
-avoid-PATH_MAX.patch
-jam-wall-clean.patch
kfreebsd-jam.patch
python2.5-elementtree.patch
library-naming.patch
-suppress-compiler-warnings.patch
-gcc43-date_time.patch
-gcc43-path_name_check.patch
date_time_date_formatting_hpp.patch
-system-error-code.patch
-add-disable-long-double.patch
mpi-python.patch
+jam-wall-clean.patch
Deleted: boost/trunk/debian/patches/suppress-compiler-warnings.patch
===================================================================
--- boost/trunk/debian/patches/suppress-compiler-warnings.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/suppress-compiler-warnings.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,37 +0,0 @@
-The fixes to time.hpp are applied to upstream SVN post 1.36.0
-see http://svn.boost.org/trac/boost/changeset/47957
-
-The fix for topological_sort.hpp reported upstream
-as http://svn.boost.org/trac/boost/ticket/2209
-- marked as closed in r49000
-
---- boost-posix-2008-03-21.orig/boost/date_time/time.hpp
-+++ boost-posix-2008-03-21/boost/date_time/time.hpp
-@@ -77,14 +77,14 @@
- /*! Optional bool parameter will return time zone as an offset
- * (ie "+07:00"). Empty string is returned for classes that do
- * not use a time_zone */
-- std::string zone_name(bool as_offset=false) const
-+ std::string zone_name(bool = false) const
- {
- return time_system::zone_name(time_);
- }
- /*! Optional bool parameter will return time zone as an offset
- * (ie "+07:00"). Empty string is returned for classes that do
- * not use a time_zone */
-- std::string zone_abbrev(bool as_offset=false) const
-+ std::string zone_abbrev(bool = false) const
- {
- return time_system::zone_name(time_);
- }
---- boost-posix-2008-03-21.orig/boost/graph/topological_sort.hpp
-+++ boost-posix-2008-03-21/boost/graph/topological_sort.hpp
-@@ -37,7 +37,7 @@
- : m_iter(_iter) { }
-
- template <typename Edge, typename Graph>
-- void back_edge(const Edge& u, Graph&) { throw not_a_dag(); }
-+ void back_edge(const Edge&, Graph&) { throw not_a_dag(); }
-
- template <typename Vertex, typename Graph>
- void finish_vertex(const Vertex& u, Graph&) { *m_iter++ = u; }
Deleted: boost/trunk/debian/patches/system-error-code.patch
===================================================================
--- boost/trunk/debian/patches/system-error-code.patch 2009-02-17 05:30:18 UTC (rev 14372)
+++ boost/trunk/debian/patches/system-error-code.patch 2009-02-21 17:16:29 UTC (rev 14373)
@@ -1,26 +0,0 @@
-Changeset 49717 from Boost SVN.
-Applies to 1.36, 1.37. Should be fixed upstream post 1.37.
-
-Fixes upstream https://svn.boost.org/trac/boost/ticket/2461
-Debian http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=503917
-
-
---- boost1.36-1.36.0.orig/boost/system/error_code.hpp
-+++ boost1.36-1.36.0/boost/system/error_code.hpp
-@@ -207,6 +207,7 @@
-
- # ifndef BOOST_SYSTEM_NO_DEPRECATED
- // deprecated synonyms
-+ inline const error_category & get_posix_category() { return get_generic_category(); }
- static const error_category & posix_category = get_generic_category();
- static const error_category & errno_ecat = get_generic_category();
- static const error_category & native_ecat = get_system_category();
-@@ -214,7 +215,7 @@
-
- // class error_condition -----------------------------------------------//
-
-- // error_conditions are portable, error_codes are system or lib specific
-+ // error_conditions are portable, error_codes are system or library specific
-
- class error_condition
- {
More information about the pkg-boost-commits
mailing list