[Boost-commit] svn:boost r68728 - in trunk/tools/build/v2: . engine

Subject: [Boost-commit] svn:boost r68728 - in trunk/tools/build/v2: . engine
From: kbelco_at_[hidden]
Date: 2011-02-08 13:34:56

Author: noel_belcourt
Date: 2011-02-08 13:34:53 EST (Tue, 08 Feb 2011)
New Revision: 68728
URL: http://svn.boost.org/trac/boost/changeset/68728

Log:
With gcc-4.5.2, the stuct option conflicts with

an identically named struct in the gcc headers.
Renamed the bjam struct to bjam_option in all
places where referenced.

Text files modified: 
   trunk/tools/build/v2/engine/jam.c    |     2                                         
   trunk/tools/build/v2/engine/option.c |     4                                         
   trunk/tools/build/v2/engine/option.h |     8 +-                                      
   trunk/tools/build/v2/user-config.jam |   136 ++++++++++++--------------------------- 
   4 files changed, 51 insertions(+), 99 deletions(-)

Modified: trunk/tools/build/v2/engine/jam.c
==============================================================================
--- trunk/tools/build/v2/engine/jam.c	(original)
+++ trunk/tools/build/v2/engine/jam.c	2011-02-08 13:34:53 EST (Tue, 08 Feb 2011)
@@ -217,7 +217,7 @@
 {
     int                     n;
     char                  * s;
-    struct option           optv[N_OPTS];
+    struct bjam_option      optv[N_OPTS];
     char            const * all = "all";
     int                     status;
     int                     arg_c = argc;

Modified: trunk/tools/build/v2/engine/option.c
==============================================================================
--- trunk/tools/build/v2/engine/option.c	(original)
+++ trunk/tools/build/v2/engine/option.c	2011-02-08 13:34:53 EST (Tue, 08 Feb 2011)
@@ -17,7 +17,7 @@
  *        was supplied for an option that does not require one."
  */
 
-int getoptions( int argc, char * * argv, char * opts, option * optv )
+int getoptions( int argc, char * * argv, char * opts, bjam_option * optv )
 {
     int i;
     int optc = N_OPTS;
@@ -84,7 +84,7 @@
  * Name: getoptval() - find an option given its character.
  */
 
-char * getoptval( option * optv, char opt, int subopt )
+char * getoptval( bjam_option * optv, char opt, int subopt )
 {
     int i;
     for ( i = 0; i < N_OPTS; ++i, ++optv )

Modified: trunk/tools/build/v2/engine/option.h
==============================================================================
--- trunk/tools/build/v2/engine/option.h	(original)
+++ trunk/tools/build/v2/engine/option.h	2011-02-08 13:34:53 EST (Tue, 08 Feb 2011)
@@ -11,13 +11,13 @@
  *  \ -) "Command line option."
  */
 
-typedef struct option
+typedef struct bjam_option
 {
     char    flag;       /* filled in by getoption() */
     char    *val;       /* set to random address if true */
-} option;
+} bjam_option;
 
 # define N_OPTS 256
 
-int     getoptions( int argc, char **argv, char *opts, option *optv );
-char *  getoptval( option *optv, char opt, int subopt );
+int     getoptions( int argc, char **argv, char *opts, bjam_option *optv );
+char *  getoptval( bjam_option *optv, char opt, int subopt );

Modified: trunk/tools/build/v2/user-config.jam
==============================================================================
--- trunk/tools/build/v2/user-config.jam	(original)
+++ trunk/tools/build/v2/user-config.jam	2011-02-08 13:34:53 EST (Tue, 08 Feb 2011)
@@ -1,92 +1,44 @@
-# Copyright 2003, 2005 Douglas Gregor
-# Copyright 2004 John Maddock
-# Copyright 2002, 2003, 2004, 2007 Vladimir Prus
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-
-#   This file is used to configure your Boost.Build installation. You can modify
-# this file in place, or you can place it in a permanent location so that it
-# does not get overwritten should you get a new version of Boost.Build. See:
-#
-#   http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html
-#
-# for documentation about possible permanent locations.
-
-#   This file specifies which toolsets (C++ compilers), libraries, and other
-# tools are available. Often, you should be able to just uncomment existing
-# example lines and adjust them to taste. The complete list of supported tools,
-# and configuration instructions can be found at:
-#
-#   http://boost.org/boost-build2/doc/html/bbv2/reference/tools.html
-#
-
-#   This file uses Jam language syntax to describe available tools. Mostly,
-# there are 'using' lines, that contain the name of the used tools, and
-# parameters to pass to those tools -- where paremeters are separated by
-# semicolons. Important syntax notes:
-#
-#   - Both ':' and ';' must be separated from other tokens by whitespace
-#   - The '\' symbol is a quote character, so when specifying Windows paths you
-#     should use '/' or '\\' instead.
-#
-# More details about the syntax can be found at:
-#
-#   http://boost.org/boost-build2/doc/html/bbv2/advanced.html#bbv2.advanced.jam_language
-#
-
-# ------------------
-# GCC configuration.
-# ------------------
-
-# Configure gcc (default version).
-# using gcc ;
-
-# Configure specific gcc version, giving alternative name to use.
-# using gcc : 3.2 : g++-3.2 ;
-
-
-# -------------------
-# MSVC configuration.
-# -------------------
-
-# Configure msvc (default version, searched for in standard locations and PATH).
-# using msvc ;
-
-# Configure specific msvc version (searched for in standard locations and PATH).
-# using msvc : 8.0 ;
-
-
-# ----------------------
-# Borland configuration.
-# ----------------------
-# using borland ;
-
-
-# ----------------------
-# STLPort configuration.
-# ----------------------
-
-#   Configure specifying location of STLPort headers. Libraries must be either
-# not needed or available to the compiler by default.
-# using stlport : : /usr/include/stlport ;
-
-# Configure specifying location of both headers and libraries explicitly.
-# using stlport : : /usr/include/stlport /usr/lib ;
-
-
-# -----------------
-# QT configuration.
-# -----------------
-
-# Configure assuming QTDIR gives the installation prefix.
-# using qt ;
-
-# Configure with an explicit installation prefix.
-# using qt : /usr/opt/qt ;
-
-# ---------------------
-# Python configuration.
-# ---------------------
-
-# Configure specific Python version.
-# using python : 3.1 : /usr/bin/python3 : /usr/include/python3.1 : /usr/lib ;
+# Copyright 2003, 2005 Douglas Gregor 
+# Copyright 2004 John Maddock 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
+#  This file is used to configure your Boost.Build installation. Please read
+#  the user manual to find out where to put it.
+
+#  Toolset declarations are most important in this file. They tell Boost.Build
+#  what compilers are available and where to look for them. The first toolset
+#  will become "default" one.
+#  Some important libraries can also be configured.
+#  Uncomment relevant parts to suite your local configuration and preferences.
+
+import toolset : using ;
+
+using python
+  : 2.5
+  : /home/kbelco/bin/python/linux
+  ;
+
+# : /sierra/Sntools/extras/mpi/RHEL5/openmpi-1.4.1/pgi-10.1-64Bit/bin/mpicxx
+# : /scratch/pgi/linux86-64/2010/mpi/mpich/bin/mpicxx
+using mpi
+  : /sierra/Sntools/extras/mpi/RHEL5/openmpi-1.4.1/pgi-10.1-64Bit/bin/mpicxx
+  ;
+
+using gcc
+  ;
+
+using pgi
+  : 10.9
+  : /scratch/pgi/linux86-64/10.9/bin/pgCC
+  : <cxxflags>"-Wc,-a --brief_diagnostics --error_limit1 --compress_names --diag_suppress450 --no_using_std --zc_eh"
+    <linkflags>"--zc_eh"
+  ;
+
+using pgi
+  : 10.1
+  : /sierra/Sntools/extras/compilers/pgi/linux86-64/10.1/bin/pgCC
+  : <cxxflags>"-Wc,-a --brief_diagnostics --error_limit1 --compress_names --diag_suppress450 --no_using_std --zc_eh"
+    <linkflags>"--zc_eh"
+  ;