- Update to 1.37

PR:		ports/129226
Submitted by:	Alexander Churanov <alexanderchuranov AT gmail.com> (maintainer)
Helped by:	amdmi3
Exp-run by:	pav
This commit is contained in:
Li-Wen Hsu 2009-04-07 12:11:31 +00:00
parent 8b40a9438e
commit 01b3694f01
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=231772
12 changed files with 12882 additions and 1876 deletions

View File

@ -6,10 +6,9 @@
# $FreeBSD$
PORTNAME= boost
PORTVERSION= 1.34.1
PORTVERSION= 1.37.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
MASTER_SITES= SOURCEFORGE
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= churanov.port.maintainer@gmail.com
@ -37,9 +36,12 @@ OPTIONS= VERBOSE_BUILD "Show compiler messages" off \
OPTIMIZED_CFLAGS "Enable -O3 optimization" off
UNIQ= /usr/bin/uniq
BOOST_LIBS= date_time filesystem graph iostreams prg_exec_monitor\
program_options regex serialization signals\
unit_test_framework wave wserialization
BOOST_LIBS= date_time filesystem graph iostreams \
math_c99 math_c99f math_tr1 math_tr1f \
prg_exec_monitor program_options regex \
serialization signals system unit_test_framework \
wave wserialization
BOOST_SHARED_LIB_VER= 4
PKGMESSAGE= ${WRKDIR}/pkg-message
@ -63,21 +65,22 @@ WITH_PYTHON= IMPLIED_BY_PYSTE
#
.if defined(WITH_PYTHON)
PKGNAMESUFFIX= -python
PLIST_SUB+= BOOST_PYTHON=""
MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}"\
PYTHON_VERSION="${PYTHON_VERSION}"\
PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
PLIST_SUB+= BOOST_PYTHON="" \
PYTHON_VER=${PYTHON_VER}
MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}" \
PYTHON_VERSION="${PYTHON_VERSION}" \
PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}" \
PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
BOOST_LIBS+= python
.if defined(WITH_PYSTE)
. if defined(WITH_PYSTE)
RUN_DEPENDS+= gccxml:${PORTSDIR}/devel/gccxml \
${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
PLIST_SUB+= BOOST_PYSTE=""
.else
. else
PLIST_SUB+= BOOST_PYSTE="@comment "
.endif
. endif
.else
PLIST_SUB+= BOOST_PYTHON="@comment "
PLIST_SUB+= BOOST_PYSTE="@comment "
@ -128,6 +131,10 @@ BJAM= ${WRKSRC}/tools/jam/src/bin.freebsdsparc/bjam
BJAM= ${WRKSRC}/tools/jam/src/bin.freebsdia64/bjam
.elif ${ARCH} == powerpc
BJAM= ${WRKSRC}/tools/jam/src/bin.freebsdppc/bjam
.elif ${ARCH} == i386
BJAM= ${WRKSRC}/tools/jam/src/bin.freebsdx86/bjam
.elif ${ARCH} == amd64
BJAM= ${WRKSRC}/tools/jam/src/bin.freebsdx86_64/bjam
.else
BJAM= ${WRKSRC}/tools/jam/src/bin.freebsd/bjam
.endif
@ -170,14 +177,14 @@ post-patch:
# Do the right thing(tm) for pthread support and respect CXX
@${REINPLACE_CMD}\
-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|'\
-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|'\
-e 's|%%CXX%%|${CXX}|'\
-e 's|%%CXXFLAGS%%|${CXXFLAGS}|'\
-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-e 's|%%CXX%%|${CXX}|' \
-e 's|%%CXXFLAGS%%|${CXXFLAGS}|' \
${WRKSRC}/tools/build/v2/tools/gcc.jam
@${REINPLACE_CMD}\
-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/-//}|'\
-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/-//}|' \
${WRKSRC}/tools/build/v2/tools/python.jam
post-configure:
@ -194,12 +201,12 @@ do-build:
# build the library
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX}\
${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX} \
--toolset=${BOOST_TOOLS}
# build bgl-viz library
cd ${WRKSRC}/libs/graph/build && \
${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX}\
${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX} \
--toolset=${BOOST_TOOLS}
# build random device code
@ -220,7 +227,7 @@ do-install:
# Install libraries
${MKDIR} ${PREFIX}/lib
${FIND} ${WRKSRC}/bin.v2/libs -type f -name "*.a"\
${FIND} ${WRKSRC}/bin.v2/libs -type f -name "*.a" \
-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
${FIND} ${WRKSRC}/bin.v2/libs -type f \
@ -237,11 +244,11 @@ do-install:
# Install headers
${MKDIR} ${PREFIX}/include
cd ${WRKSRC} && \
${FIND} boost -type d -a \! -name "*.orig"\
${FIND} boost -type d -a \! -name "*.orig" \
-exec ${MKDIR} ${PREFIX}/include/\{\} \;
cd ${WRKSRC} && \
${FIND} boost -type f -a \! -name "*.orig"\
${FIND} boost -type f -a \! -name "*.orig" \
-exec ${INSTALL_DATA} \{\} ${PREFIX}/include/\{\} \;
# Install pyste, the Boost.Python code generator
@ -262,16 +269,16 @@ do-install:
${FIND} ${WRKSRC} -type f -exec ${CHMOD} 0444 {} \;
${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \;
${FIND} ${WRKSRC} -name ".cvsignore" -delete
cd ${WRKSRC} &&\
${FIND} . -name "*.htm" -o -name "*.html" -o -name "*.css"\
-o -name "*.jp*g" -o -name "*.png" -o -name "*.gif"\
cd ${WRKSRC} && \
${FIND} . -name "*.htm" -o -name "*.html" -o -name "*.css" \
-o -name "*.jp*g" -o -name "*.png" -o -name "*.gif" \
| ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
cd ${WRKSRC}/libs &&\
${FIND} . -name "example" -o -name "examples" -o -name "*example*.cpp"\
-o -name "*example*.c" -o -name "*example*.hpp" | ${UNIQ} |\
cd ${WRKSRC}/libs && \
${FIND} . -name "example" -o -name "examples" -o -name "*example*.cpp" \
-o -name "*example*.c" -o -name "*example*.hpp" | ${UNIQ} | \
${GREP} -v "assign/test" | ${GREP} -v "iterator/test" | \
${GREP} -v "range/test" |\
${GREP} -v "range/test" | \
${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR}/libs -
.endif

View File

@ -1,3 +1,3 @@
MD5 (boost_1_34_1.tar.bz2) = 2d938467e8a448a2c9763e0a9f8ca7e5
SHA256 (boost_1_34_1.tar.bz2) = 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
SIZE (boost_1_34_1.tar.bz2) = 12986931
MD5 (boost_1_37_0.tar.bz2) = 8d9f990bfb7e83769fa5f1d6f065bc92
SHA256 (boost_1_37_0.tar.bz2) = d52ef49f70b1b9addc4e0d1a3a2a1966227f0d173c3301bac3e6d399eeac5472
SIZE (boost_1_37_0.tar.bz2) = 29435646

View File

@ -1,19 +0,0 @@
--- boost/python/detail/config.hpp.orig Tue Nov 29 23:27:18 2005
+++ boost/python/detail/config.hpp Sun Dec 17 13:24:16 2006
@@ -111,7 +111,15 @@
# define BOOST_PYTHON_OFFSETOF(s_name, s_member) \
((size_t)__INTADDR__(&(((s_name *)0)->s_member)))
#else
-# define BOOST_PYTHON_OFFSETOF offsetof
+// workaround from http://www.freebsd.org/cgi/query-pr.cgi?pr=72307
+#if __GNUC__ <= 3
+#define BOOST_PYTHON_OFFSETOF(TYPE, MEMBER)\
+ (__offsetof__ (reinterpret_cast <size_t>\
+ (&reinterpret_cast <const volatile char &>\
+ (static_cast<TYPE *> (0)->MEMBER))))
+#else
+#define BOOST_PYTHON_OFFSETOF offsetof
+#endif
#endif
#endif // CONFIG_DWA052200_H_

View File

@ -0,0 +1,14 @@
--- boost/function/function_template.hpp.orig 2008-10-16 17:21:50.000000000 +0400
+++ boost/function/function_template.hpp 2009-03-25 04:12:15.000000000 +0300
@@ -950,10 +950,10 @@
f.vtable->manager(f.functor, this->functor,
boost::detail::function::move_functor_tag);
f.vtable = 0;
-#if !defined(BOOST_NO_EXCEPTIONS)
} else {
clear();
}
+#if !defined(BOOST_NO_EXCEPTIONS)
} catch (...) {
vtable = 0;
throw;

View File

@ -0,0 +1,150 @@
--- boost/test/impl/execution_monitor.ipp.orig Mon Oct 13 12:20:26 2008
+++ boost/test/impl/execution_monitor.ipp Sun Nov 9 00:36:42 2008
@@ -289,50 +289,11 @@
switch( m_sig_info->si_signo ) {
case SIGILL:
- switch( m_sig_info->si_code ) {
- case ILL_ILLOPC:
- report_error( execution_exception::system_fatal_error,
- "signal: illegal opcode; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_ILLOPN:
- report_error( execution_exception::system_fatal_error,
- "signal: illegal operand; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_ILLADR:
- report_error( execution_exception::system_fatal_error,
- "signal: illegal addressing mode; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_ILLTRP:
- report_error( execution_exception::system_fatal_error,
- "signal: illegal trap; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_PRVOPC:
- report_error( execution_exception::system_fatal_error,
- "signal: privileged opcode; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_PRVREG:
- report_error( execution_exception::system_fatal_error,
- "signal: privileged register; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_COPROC:
- report_error( execution_exception::system_fatal_error,
- "signal: co-processor error; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- case ILL_BADSTK:
- report_error( execution_exception::system_fatal_error,
- "signal: internal stack error; address of failing instruction: 0x%08lx",
- m_sig_info->si_addr );
- break;
- }
+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3
+ report_error( execution_exception::system_fatal_error,
+ "signal: SIGILL (illegal instruction)" );
break;
-
+
case SIGFPE:
switch( m_sig_info->si_code ) {
case FPE_INTDIV:
@@ -379,73 +340,21 @@
break;
case SIGSEGV:
- switch( m_sig_info->si_code ) {
- case SEGV_MAPERR:
- report_error( execution_exception::system_fatal_error,
- "memory access violation at address: 0x%08lx: no mapping at fault address",
- m_sig_info->si_addr );
- break;
- case SEGV_ACCERR:
- report_error( execution_exception::system_fatal_error,
- "memory access violation at address: 0x%08lx: invalid permissions",
- m_sig_info->si_addr );
- break;
- }
+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3
+ report_error( execution_exception::system_fatal_error,
+ "signal: SIGSEGV (invalid memory reference)" );
break;
case SIGBUS:
- switch( m_sig_info->si_code ) {
- case BUS_ADRALN:
- report_error( execution_exception::system_fatal_error,
- "memory access violation at address: 0x%08lx: invalid address alignment",
- m_sig_info->si_addr );
- break;
- case BUS_ADRERR:
- report_error( execution_exception::system_fatal_error,
- "memory access violation at address: 0x%08lx: non-existent physical address",
- m_sig_info->si_addr );
- break;
- case BUS_OBJERR:
- report_error( execution_exception::system_fatal_error,
- "memory access violation at address: 0x%08lx: object specific hardware error",
- m_sig_info->si_addr );
- break;
- }
+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3
+ report_error( execution_exception::system_fatal_error,
+ "signal: SIGBUS (access to an undefined portion of a memory object)" );
break;
case SIGCHLD:
- switch( m_sig_info->si_code ) {
- 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;
- case CLD_KILLED:
- report_error( execution_exception::system_error,
- "child was killed; 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;
- case CLD_DUMPED:
- report_error( execution_exception::system_error,
- "child terminated abnormally; 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;
- case CLD_TRAPPED:
- report_error( execution_exception::system_error,
- "traced child has trapped; 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;
- case CLD_STOPPED:
- report_error( execution_exception::system_error,
- "child has stopped; 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;
- case CLD_CONTINUED:
- report_error( execution_exception::system_error,
- "stopped child had continued; 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;
- }
+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3
+ report_error( execution_exception::system_error,
+ "signal: SIGCHLD (child process terminated, stopped, or continued)" );
break;
#if defined(BOOST_TEST_CATCH_SIGPOLL)
@@ -695,7 +604,8 @@
static bool ignore_sigchild( siginfo_t* info )
{
- return info->si_signo == SIGCHLD && info->si_code == CLD_EXITED
+ // for now just use an assumption that children always exit normally
+ return true //info->si_signo == SIGCHLD && info->si_code == CLD_EXITED
#ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE
;
#else

View File

@ -0,0 +1,38 @@
--- libs/math/build/Jamfile.v2.orig Tue Jul 15 20:30:27 2008
+++ libs/math/build/Jamfile.v2 Wed Nov 12 12:04:47 2008
@@ -51,8 +51,6 @@
sph_neumann
;
-compile has_long_double_support.cpp ;
-
lib boost_math_tr1 : ../src/tr1/$(TR1_SOURCES).cpp
:
<link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
@@ -63,12 +61,6 @@
<link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
;
-lib boost_math_tr1l : ../src/tr1/$(TR1_SOURCES)l.cpp
- :
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- <dependency>has_long_double_support
- ;
-
lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp
:
<link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
@@ -79,12 +71,6 @@
<link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
;
-lib boost_math_c99l : ../src/tr1/$(C99_SOURCES)l.cpp
- :
- <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
- <dependency>has_long_double_support
- ;
-
-boost-install boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l ;
+boost-install boost_math_c99 boost_math_c99f boost_math_tr1 boost_math_tr1f ;

View File

@ -1,7 +1,7 @@
--- libs/regex/build/Jamfile.v2.orig Wed Jun 27 17:05:32 2007
+++ libs/regex/build/Jamfile.v2 Wed Jun 27 17:05:43 2007
@@ -132,7 +132,7 @@
--- libs/regex/build/Jamfile.v2.orig Thu Oct 16 13:01:02 2008
+++ libs/regex/build/Jamfile.v2 Sun Nov 9 10:35:40 2008
@@ -189,7 +189,7 @@
if $(ICU_PATH)
{
- if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"

View File

@ -1,17 +1,17 @@
--- tools/build/v2/tools/common.jam.orig Wed Jun 20 20:50:33 2007
+++ tools/build/v2/tools/common.jam Wed Jun 20 20:51:11 2007
@@ -645,14 +645,6 @@
result += [ join-tag $(f:G=) :
[ toolset-tag $(name) : $(type) : $(property-set) ] ] ;
--- tools/build/v2/tools/common.jam.orig Thu Oct 16 12:42:03 2008
+++ tools/build/v2/tools/common.jam Tue Nov 11 23:43:27 2008
@@ -760,14 +760,6 @@
result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
$(property-set) ] ] ;
- case <threading> :
- result += [ join-tag $(f:G=) :
- [ threading-tag $(name) : $(type) : $(property-set) ] ] ;
-
- result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type)
- : $(property-set) ] ] ;
-
- case <runtime> :
- result += [ join-tag $(f:G=) :
- [ runtime-tag $(name) : $(type) : $(property-set) ] ] ;
-
- result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) :
- $(property-set) ] ] ;
-
case <version:*> :
local key = [ MATCH <version:(.*)> : $(f:G) ] ;
local version = [ $(property-set).get <$(key)> ] ;

View File

@ -1,6 +1,6 @@
--- tools/build/v2/tools/gcc.jam.orig Thu May 3 08:09:04 2007
+++ tools/build/v2/tools/gcc.jam Sun Jul 1 12:22:38 2007
@@ -62,7 +62,7 @@
--- tools/build/v2/tools/gcc.jam.orig Thu Oct 16 12:42:03 2008
+++ tools/build/v2/tools/gcc.jam Tue Nov 11 23:48:37 2008
@@ -88,7 +88,7 @@
{
# Information about the gcc command...
# The command.
@ -9,21 +9,21 @@
# The root directory of the tool install.
local root = [ feature.get-values <root> : $(options) ] ;
# The bin directory where to find the command to execute.
@@ -268,7 +268,7 @@
@@ -292,7 +292,7 @@
# Declare flags and action for compilation
flags gcc.compile OPTIONS <optimization>off : -O0 ;
-flags gcc.compile OPTIONS <optimization>speed : -O3 ;
+flags gcc.compile OPTIONS <optimization>speed : %%CXXFLAGS%% ;
flags gcc.compile OPTIONS <optimization>space : -Os ;
# Declare flags and action for compilation.
toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
+toolset.flags gcc.compile OPTIONS <optimization>speed : %%CXXFLAGS%% ;
toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
@@ -656,7 +656,7 @@
}
case *BSD :
{
- flags gcc OPTIONS <threading>multi : -pthread ;
+ flags gcc OPTIONS <threading>multi : %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%% ;
# there is no -lrt on BSD
}
case DragonFly :
toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
@@ -811,7 +811,7 @@
}
case *bsd :
{
- option = -pthread ;
+ option = %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%% ;
# There is no -lrt on BSD.
}
case sgi :

View File

@ -1,10 +1,11 @@
--- ./tools/build/v2/tools/python.jam.orig Wed Jun 27 10:33:39 2007
+++ ./tools/build/v2/tools/python.jam Wed Jun 27 10:39:36 2007
@@ -625,6 +625,7 @@
--- tools/build/v2/tools/python.jam.orig Thu Oct 16 12:42:03 2008
+++ tools/build/v2/tools/python.jam Tue Nov 11 23:50:21 2008
@@ -650,7 +650,7 @@
case windows : return ;
case hpux : return <library>rt ;
- case *bsd : return <library>pthread <toolset>gcc:<library>util ;
+ case *bsd : return <library>%%PTHREAD_LIBS%% <toolset>gcc:<library>util ;
case * : return <library>pthread <library>dl <toolset>gcc:<library>util ;
}
case aix : return <library>pthread <library>dl ;

View File

@ -1,11 +1,11 @@
--- tools/jam/src/build.jam.orig 2007-07-07 21:34:09.000000000 +0000
+++ tools/jam/src/build.jam 2007-07-07 21:36:19.000000000 +0000
@@ -153,7 +153,7 @@
--- tools/jam/src/build.jam.orig Tue Jul 29 15:43:31 2008
+++ tools/jam/src/build.jam Tue Nov 11 23:52:09 2008
@@ -176,7 +176,7 @@
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
: -pedantic
: -pedantic -fno-strict-aliasing
- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
+ [ opt --release : [ opt --symbols : -g : -s ] -O3 -fno-strict-aliasing ]
[ opt --debug : -g -O0 -fno-inline ]
-I$(--python-include) -Wno-long-long
-I$(--python-include) -I$(--extra-include) -Wno-long-long
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;

File diff suppressed because it is too large Load Diff