Merge outstanding 1.33 changes to trunk:

* QNX/qcc support.
* STLport5 support.
* STLport support docs cleanup.
* kFreeBSD support.
* MinGW/MSYS support.


[SVN r31345]

jam_src/README

@@ -87,6 +87,7 @@ INSTALLING
 	    SunOS4.1		SUNOS
 	    Ultrix 4.2		ULTRIX
 	    BeOS		BEOS		*
+	    GNU/kFreeBSD	KFREEBSD
 
 	    * requires editing Makefile
 

jam_src/build.jam

@@ -216,6 +216,13 @@ toolset msvc cl : /Fe : -D
     [ opt --debug : /MLd /DEBUG /Z7 /Od /Ob0 ]
     -I$(--python-include)
     : kernel32.lib advapi32.lib $(--python-lib) ;
+## QNX 6.x GCC 3.x/2.95.3
+toolset qcc qcc : "-o " : -D
+    : -pedantic
+    [ opt --release : [ opt --symbols : -g : -s ] -O3 -finline-functions ]
+    [ opt --debug : -g -O0 -fno-inline ]
+    -I$(--python-include)
+    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
 ## Sun Workshop 6 C++
 toolset sunpro cc : "-o " : -D
     :

jam_src/build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#~ Copyright 2002-2004 Rene Rivera.
+#~ Copyright 2002-2005 Rene Rivera.
 #~ 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)
 
@@ -68,8 +68,15 @@ Guess_Toolset ()
     elif test_uname IRIX ; then BOOST_JAM_TOOLSET=mipspro
     elif test_uname IRIX64 ; then BOOST_JAM_TOOLSET=mipspro
     elif test_uname OSF1 ; then BOOST_JAM_TOOLSET=tru64cxx
+    elif test_path qcc ; then BOOST_JAM_TOOLSET=qcc
     elif test_path gcc ; then BOOST_JAM_TOOLSET=gcc
     elif test_path icc ; then BOOST_JAM_TOOLSET=intel-linux
+    elif test -r /opt/intel/cc/9.0/bin/iccvars.sh ; then
+        BOOST_JAM_TOOLSET=intel-linux
+        BOOST_JAM_TOOLSET_ROOT=/opt/intel/cc/9.0
+    elif test -r /opt/intel_cc_80/bin/iccvars.sh ; then
+        BOOST_JAM_TOOLSET=intel-linux
+        BOOST_JAM_TOOLSET_ROOT=/opt/intel_cc_80
     elif test -r /opt/intel/compiler70/ia32/bin/iccvars.sh ; then
         BOOST_JAM_TOOLSET=intel-linux
         BOOST_JAM_TOOLSET_ROOT=/opt/intel/compiler70/ia32/
@@ -113,7 +120,7 @@ BOOST_JAM_OPT_MKJAMBASE="-o bootstrap/mkjambase0"
 BOOST_JAM_OPT_YYACC="-o bootstrap/yyacc0"
 case $BOOST_JAM_TOOLSET in
     mingw)
-    if test -r ${BOOST_JAM_TOOLSET_ROOT}bin/gcc -r ; then
+    if test -r ${BOOST_JAM_TOOLSET_ROOT}bin/gcc ; then
         export PATH=${BOOST_JAM_TOOLSET_ROOT}bin:$PATH
     fi
     BOOST_JAM_CC="gcc -DNT"
@@ -128,7 +135,11 @@ case $BOOST_JAM_TOOLSET in
     ;;
     
     intel-linux)
-    if test -r /opt/intel/compiler70/ia32/bin/iccvars.sh ; then
+    if test -r /opt/intel/cc/9.0/bin/iccvars.sh ; then
+        BOOST_JAM_TOOLSET_ROOT=/opt/intel/cc/9.0/
+    elif test -r /opt/intel_cc_80/bin/iccvars.sh ; then
+        BOOST_JAM_TOOLSET_ROOT=/opt/intel_cc_80/
+    elif test -r /opt/intel/compiler70/ia32/bin/iccvars.sh ; then
         BOOST_JAM_TOOLSET_ROOT=/opt/intel/compiler70/ia32/
     elif test -r /opt/intel/compiler60/ia32/bin/iccvars.sh ; then
         BOOST_JAM_TOOLSET_ROOT=/opt/intel/compiler60/ia32/
@@ -136,6 +147,17 @@ case $BOOST_JAM_TOOLSET in
         BOOST_JAM_TOOLSET_ROOT=/opt/intel/compiler50/ia32/
     fi
     if test -r ${BOOST_JAM_TOOLSET_ROOT}bin/iccvars.sh ; then
+        # iccvars doesn't change LD_RUN_PATH. We adjust LD_RUN_PATH
+        # here in order not to have to rely on ld.so.conf knowing the
+        # icc library directory. We do this before running iccvars.sh
+        # in order to allow a user to add modifications to LD_RUN_PATH
+        # in iccvars.sh.
+        if test -z "${LD_RUN_PATH}"; then
+            LD_RUN_PATH="${BOOST_JAM_TOOLSET_ROOT}lib"
+        else
+            LD_RUN_PATH="${BOOST_JAM_TOOLSET_ROOT}lib:${LD_RUN_PATH}"
+        fi
+        export LD_RUN_PATH
         . ${BOOST_JAM_TOOLSET_ROOT}bin/iccvars.sh
     fi
     BOOST_JAM_CC=icc
@@ -188,6 +210,10 @@ case $BOOST_JAM_TOOLSET in
     BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
     ;;
    
+    qcc)
+    BOOST_JAM_CC=qcc
+    ;;
+    
     *)
     error_exit "Unknown toolset: $BOOST_JAM_TOOLSET"
     ;;

jam_src/execunix.c

@@ -11,7 +11,7 @@
 # include <time.h>
 # include <unistd.h> /* needed for vfork(), _exit() prototypes */
 
-#if defined(sun) || defined(__sun)
+#if defined(sun) || defined(__sun) || defined(linux)
 #include <wait.h>
 #endif
 

jam_src/fileunix.c

@@ -19,7 +19,7 @@
 # include "newstr.h"
 # include <stdio.h>
 
-#if defined(sun) || defined(__sun)
+#if defined(sun) || defined(__sun) || defined(linux)
 # include <unistd.h> /* needed for read and close prototype */
 #endif
 

jam_src/jam.h

@@ -313,11 +313,11 @@
 # define NO_VFORK
 # endif
 # ifdef __QNX__
+# define unix
 # ifdef __QNXNTO__
 # define OSMINOR "OS=QNXNTO"
 # define OS_QNXNTO
 # else
-# define unix
 # define OSMINOR "OS=QNX"
 # define OS_QNX
 # define NO_VFORK
@@ -385,6 +385,10 @@
 # define OS_OPENBSD
 # define unix
 # endif
+# if defined (__FreeBSD_kernel__) && !defined(__FreeBSD__)
+# define OSMINOR "OS=KFREEBSD"
+# define OS_KFREEBSD
+# endif
 # ifndef OSMINOR
 # define OSMINOR "OS=UNKNOWN"
 # endif