head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.6.2.2 OPENPKG_E1_FP:1.6.2.2 OPENPKG_2_STABLE_MP:1.6 OPENPKG_2_STABLE_20061018:1.6.2.2 OPENPKG_2_STABLE:1.6.0.2 OPENPKG_CW_FP:1.3; locks; strict; comment @# @; 1.10 date 2009.08.29.09.47.14; author rse; state Exp; branches; next 1.9; commitid U5aCNhFPIdmiEz1u; 1.9 date 2008.12.20.16.52.34; author rse; state Exp; branches; next 1.8; commitid UG2GmzDmFAoq6evt; 1.8 date 2007.06.17.19.20.10; author thl; state Exp; branches; next 1.7; commitid 6JSAdvoRnsd9Fims; 1.7 date 2007.06.17.19.18.32; author thl; state Exp; branches; next 1.6; commitid 4qWh8OQiFU4AEims; 1.6 date 2006.07.02.17.07.42; author thl; state Exp; branches 1.6.2.1; next 1.5; commitid 7UIEAMLeP1ScbjDr; 1.5 date 2005.10.06.18.49.38; author rse; state Exp; branches; next 1.4; 1.4 date 2005.08.23.07.28.45; author rse; state Exp; branches; next 1.3; 1.3 date 2005.03.04.16.17.56; author ms; state Exp; branches; next 1.2; 1.2 date 2005.03.03.20.47.43; author ms; state Exp; branches; next 1.1; 1.1 date 2005.03.02.19.56.05; author ms; state Exp; branches; next ; 1.6.2.1 date 2006.07.02.17.07.42; author rse; state dead; branches; next 1.6.2.2; commitid iZxwRSmmWscPXUQr; 1.6.2.2 date 2006.10.16.14.48.41; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.10 log @upgrading package: boost 1.39.0 -> 1.40.0 @ text @Index: boost/math/tools/config.hpp --- boost/math/tools/config.hpp.orig 2009-05-22 19:49:00 +0200 +++ boost/math/tools/config.hpp 2009-08-29 10:03:55 +0200 @@@@ -23,7 +23,7 @@@@ #include #include -#if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \ +#if defined(__CYGWIN__) \ || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH) # define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS #endif Index: boost/test/impl/execution_monitor.ipp --- boost/test/impl/execution_monitor.ipp.orig 2009-07-04 08:36:59 +0200 +++ boost/test/impl/execution_monitor.ipp 2009-08-29 10:05:26 +0200 @@@@ -316,6 +316,7 @@@@ break; } +#if 0 switch( m_sig_info->si_signo ) { case SIGILL: switch( m_sig_info->si_code ) { @@@@ -471,11 +472,13 @@@@ case SIGCHLD: switch( m_sig_info->si_code ) { #ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS +#ifdef CLD_EXITED case CLD_EXITED: report_error( execution_exception::system_error, "child has exited; pid: %d; uid: %d; exit value: %d", (int)m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status ); break; +#endif case CLD_KILLED: report_error( execution_exception::system_error, "child was killed; pid: %d; uid: %d; exit value: %d", @@@@ -571,6 +574,7 @@@@ default: report_error( execution_exception::system_error, "unrecognized signal" ); } +#endif } //____________________________________________________________________________// @@@@ -773,8 +777,10 @@@@ { return info->si_signo == SIGCHLD #ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS +#ifdef CLD_EXITED && info->si_code == CLD_EXITED #endif +#endif #ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE ; #else Index: libs/math/src/tr1/hypotl.cpp --- libs/math/src/tr1/hypotl.cpp.orig 2009-05-22 19:49:00 +0200 +++ libs/math/src/tr1/hypotl.cpp 2009-08-29 10:03:55 +0200 @@@@ -13,10 +13,12 @@@@ namespace boost{ namespace math{ namespace tr1{ +#if 0 extern "C" long double BOOST_MATH_TR1_DECL hypotl BOOST_PREVENT_MACRO_SUBSTITUTION(long double x, long double y) { return c_policies::hypot BOOST_PREVENT_MACRO_SUBSTITUTION(x, y); } +#endif }}} Index: tools/jam/src/build.jam --- tools/jam/src/build.jam.orig 2009-07-23 12:40:42 +0200 +++ tools/jam/src/build.jam 2009-08-29 10:03:55 +0200 @@@@ -190,7 +190,7 @@@@ ## GCC 2.x, 3.x, 4.x toolset gcc gcc : "-o " : -D : -pedantic -fno-strict-aliasing - [ opt --release : [ opt --symbols : -g : -s ] -O3 ] + [ opt --release : [ opt --symbols : -g : -s ] -O0 ] [ opt --debug : -g -O0 -fno-inline ] -I$(--python-include) -I$(--extra-include) -Wno-long-long : -L$(--python-lib[1]) -l$(--python-lib[2]) ; Index: tools/jam/src/build.sh --- tools/jam/src/build.sh.orig 2009-01-10 20:42:28 +0100 +++ tools/jam/src/build.sh 2009-08-29 10:03:55 +0200 @@@@ -129,7 +129,7 @@@@ ;; gcc) - BOOST_JAM_CC=gcc + BOOST_JAM_CC="gcc -O0" ;; darwin) @ 1.9 log @upgrading package: boost 1.34.1 -> 1.37.0 @ text @d2 2 a3 2 --- boost/math/tools/config.hpp.orig 2008-10-09 19:17:35 +0200 +++ boost/math/tools/config.hpp 2008-12-20 10:09:52 +0100 d14 3 a16 3 --- boost/test/impl/execution_monitor.ipp.orig 2008-10-13 10:20:26 +0200 +++ boost/test/impl/execution_monitor.ipp 2008-12-20 11:46:16 +0100 @@@@ -287,6 +287,7 @@@@ d24 15 a38 1 @@@@ -502,6 +503,7 @@@@ d46 1 a46 3 @@@@ -695,7 +697,11 @@@@ static bool ignore_sigchild( siginfo_t* info ) d48 2 d51 2 a52 3 return info->si_signo == SIGCHLD && info->si_code == CLD_EXITED +#else + return info->si_signo == SIGCHLD d58 3 a60 3 --- libs/math/src/tr1/hypotl.cpp.orig 2008-08-04 13:51:06 +0200 +++ libs/math/src/tr1/hypotl.cpp 2008-12-20 11:48:59 +0100 @@@@ -10,9 +10,11 @@@@ d72 1 d74 3 a76 3 --- tools/jam/src/build.jam.orig 2008-07-29 13:43:31 +0200 +++ tools/jam/src/build.jam 2008-12-20 10:09:52 +0100 @@@@ -176,7 +176,7 @@@@ d86 2 a87 2 --- tools/jam/src/build.sh.orig 2007-09-20 06:36:27 +0200 +++ tools/jam/src/build.sh 2008-12-20 10:09:52 +0100 d90 1 a90 1 d95 1 a95 1 @ 1.8 log @workaround bjam crashes when compiled with gcc 4.2 @ text @d1 26 a26 15 Index: Jamfile.v2 --- Jamfile.v2.orig 2007-05-11 05:40:34 +0200 +++ Jamfile.v2 2007-06-17 12:43:12 +0200 @@@@ -112,12 +112,12 @@@@ default-build = debug release single multi - shared static + static ; if [ os.name ] = NT { - default-build += shared static ; + default-build += static ; d28 27 d56 15 a70 3 else Workaround for "bjam crashes when compiled with gcc 4.2" http://svn.boost.org/trac/boost/ticket/977 d72 3 a74 3 --- tools/jam/src/build.sh.orig 2006-02-03 17:57:42 +0100 +++ tools/jam/src/build.sh 2007-06-17 13:54:31 +0200 @@@@ -127,7 +127,7 @@@@ a82 13 Index: tools/jam/src/build.jam --- tools/jam/src/build.jam.orig 2007-06-17 14:07:34 +0200 +++ tools/jam/src/build.jam 2007-06-17 14:08:21 +0200 @@@@ -153,7 +153,7 @@@@ ## GCC 2.x, 3.x, 4.x toolset gcc gcc : "-o " : -D : -pedantic - [ opt --release : [ opt --symbols : -g : -s ] -O3 ] + [ opt --release : [ opt --symbols : -g : -s ] -O0 ] [ opt --debug : -g -O0 -fno-inline ] -I$(--python-include) -Wno-long-long : -L$(--python-lib[1]) -l$(--python-lib[2]) ; @ 1.7 log @upgrading package: boost 1.33.1 -> 1.34.0 @ text @d20 26 @ 1.6 log @upgrading package: boost 1.33.0 -> 1.33.1 @ text @d1 10 a10 11 Index: tools/build/v1/boost-base.jam --- tools/build/v1/boost-base.jam.orig 2005-07-30 17:55:37 +0200 +++ tools/build/v1/boost-base.jam 2005-08-13 10:22:58 +0200 @@@@ -2692,10 +2692,8 @@@@ version-tag = $(version-tag:J="_") ; } - tags += $(toolset-tag:J=) ; tags += $(thread-tag:J=) ; tags += $(runtime-tag:J=) ; - tags += $(version-tag) ; d12 1 a12 1 if $(tags) d14 6 @ 1.6.2.1 log @file boost.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:48:41 +0000 @ text @d1 14 @ 1.6.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 14 Index: tools/build/v1/boost-base.jam --- tools/build/v1/boost-base.jam.orig 2005-07-30 17:55:37 +0200 +++ tools/build/v1/boost-base.jam 2005-08-13 10:22:58 +0200 @@@@ -2692,10 +2692,8 @@@@ version-tag = $(version-tag:J="_") ; } - tags += $(toolset-tag:J=) ; tags += $(thread-tag:J=) ; tags += $(runtime-tag:J=) ; - tags += $(version-tag) ; if $(tags) { @ 1.5 log @cleanup packaging somewhat although it still doesn't build for me correctly @ text @a14 76 Index: Jamfile --- Jamfile.orig 2005-02-27 18:28:08 +0100 +++ Jamfile 2005-08-13 14:34:09 +0200 @@@@ -64,15 +64,6 @@@@ . By default all libraries attempt to build. - --with-python-root[=PYTHON_ROOT] - Build Boost.Python libraries with the Python - devel packages located at PYTHON_ROOT. - Default PYTHON_ROOT; C:\\tools\\python on Win32. - Default PYTHON_ROOT; /usr/local on Unix, Linux, etc. - Default PYTHON_ROOT; /usr on Cygwin. - - --with-pydebug Build Boost.Python libraries using the - Python debug runtime. " ; EXIT "" ; } @@@@ -124,17 +115,6 @@@@ local include-locate = [ MATCH "^--includedir=(.*)" : $(ARGV) ] ; include-locate ?= $(boost-locate)/include ; -# location of python -local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ; -PYTHON_ROOT ?= $(python-root) ; - -# variant for pydebug build -local with-debug-python ; -if --with-pydebug in $(ARGV) -{ - with-debug-python = debug-python ; -} - # libraries to disable building, etc. local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ; @@@@ -144,9 +124,6 @@@@ { switch $(arg) { - case --with-python-root=* : local _ ; - case --with-pydebug : local _ ; - case --with-* : with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ; } @@@@ -155,9 +132,6 @@@@ # project-root ; -# bring in the rules for python -import python ; - # local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ; version-tag = $(version-tag:J="_") ; @@@@ -176,7 +150,6 @@@@ local lib-build = debug release - [ cond $(with-debug-python) : debug-python ] [ cond $(NT) : static/dynamic ] single/multi ; Index: status/Jamfile --- status/Jamfile.orig 2005-06-23 11:57:18 +0200 +++ status/Jamfile 2005-08-13 14:35:31 +0200 @@@@ -44,7 +44,6 @@@@ subinclude libs/program_options/test ; # test-suite program_options subinclude libs/property_map/test ; # test-suite property_map subinclude libs/ptr_container/test ; # test-suite ptr_container -subinclude libs/python/test ; # test-suite python subinclude libs/random/test ; # test-suite random subinclude libs/range/test ; # test-suite range subinclude libs/regex/test ; # test-suite regex @ 1.4 log @upgrading package: boost 1.32.0 -> 1.33.0 @ text @d15 76 @ 1.3 log @finally clean up, abstract python patch code, improve description, and remove redundant environment variables and conditional constructs @ text @a0 14 Index: boost/config/platform/bsd.hpp --- boost/config/platform/bsd.hpp.orig 2004-02-27 14:13:00 +0100 +++ boost/config/platform/bsd.hpp 2005-03-03 14:15:00 +0100 @@@@ -41,7 +41,9 @@@@ // // No wide character support in the BSD header files: // -#define BOOST_NO_CWCHAR +#if !(defined(__FreeBSD__) && (__FreeBSD__ >= 5)) +# define BOOST_NO_CWCHAR +#endif // // The BSD has macros only, no functions: d2 3 a4 3 --- tools/build/v1/boost-base.jam.orig 2004-10-28 22:07:53 +0200 +++ tools/build/v1/boost-base.jam 2005-03-03 14:16:48 +0100 @@@@ -2651,10 +2651,8 @@@@ @ 1.2 log @more work on strange bjam constructs and repair buildconf to allow FreeBSD building @ text @a0 89 Index: Jamfile --- Jamfile.orig 2005-03-02 20:17:46 +0100 +++ Jamfile 2005-03-02 20:26:47 +0100 @@@@ -62,15 +62,6 @@@@ --without- Do not build, stage, or install the specified . By default all libraries attempt to build. - --with-python-root[=PYTHON_ROOT] - Build Boost.Python libraries with the Python - devel packages located at PYTHON_ROOT. - Default PYTHON_ROOT; C:\\tools\\python on Win32. - Default PYTHON_ROOT; /usr/local on Unix, Linux, etc. - Default PYTHON_ROOT; /usr on Cygwin. - - --with-pydebug Build Boost.Python libraries using the - Python debug runtime. " ; EXIT "" ; } @@@@ -122,17 +113,6 @@@@ local include-locate = [ MATCH "^--includedir=(.*)" : $(ARGV) ] ; include-locate ?= $(boost-locate)/include ; -# location of python -local python-root = [ MATCH "^--with-python-root=(.*)" : $(ARGV) ] ; -PYTHON_ROOT ?= $(python-root) ; - -# variant for pydebug build -local with-debug-python ; -if --with-pydebug in $(ARGV) -{ - with-debug-python = debug-python ; -} - # libraries to disable building, etc. local without-libraries = [ MATCH "^--without-(.*)" : $(ARGV) ] ; @@@@ -142,9 +122,6 @@@@ { switch $(arg) { - case --with-python-root=* : local _ ; - case --with-pydebug : local _ ; - case --with-* : with-libraries += [ MATCH "^--with-(.*)" : $(arg) ] ; } @@@@ -153,9 +130,6 @@@@ # project-root ; -# bring in the rules for python -import python ; - # local version-tag = [ MATCH "^([^.]+).([^.]+)" : $(BOOST_VERSION) ] ; version-tag = $(version-tag:J="_") ; @@@@ -174,7 +148,6 @@@@ local lib-build = debug release - [ cond $(with-debug-python) : debug-python ] [ cond $(NT) : static/dynamic ] single/multi ; Index: status/Jamfile --- status/Jamfile.orig 2005-03-02 20:28:44 +0100 +++ status/Jamfile 2005-03-02 20:28:37 +0100 @@@@ -38,7 +38,6 @@@@ subinclude libs/numeric/ublas ; # test-suite numeric/uBLAS subinclude libs/optional/test ; # test-suite optional subinclude libs/program_options/test ; # test-suite program_options -subinclude libs/python/test ; # test-suite python subinclude libs/random/test ; # test-suite random subinclude libs/range/test ; # test-suite range subinclude libs/regex/test ; # test-suite regex Index: Jamfile.v2 --- Jamfile.v2.orig 2005-03-02 20:30:05 +0100 +++ Jamfile.v2 2005-03-02 20:30:32 +0100 @@@@ -24,9 +24,6 @@@@ build-project libs/regex/build ; build-project libs/signals/build ; build-project libs/graph/build ; - -# Comment this out if you don't have Python2.2 installed -build-project libs/python/build ; build-project libs/thread/build ; build-project libs/filesystem/build ; build-project libs/program_options/build ; @ 1.1 log @new package: boost 1.32.0 (Collection of Useful C++ Libraries) @ text @d90 28 @