diff options
| author | barner <barner@FreeBSD.org> | 2006-08-31 11:17:38 +0000 |
|---|---|---|
| committer | barner <barner@FreeBSD.org> | 2006-08-31 11:17:38 +0000 |
| commit | dce858fb45b497ec92980870d3b09d6c035b2401 (patch) | |
| tree | b9f7114e7e2b2117a662617969bec4658bb947b4 /devel/boost | |
| parent | 94a14003365e6c068e2066ea7d96f1a59431868a (diff) | |
| download | FreeBSD-ports-dce858fb45b497ec92980870d3b09d6c035b2401.zip FreeBSD-ports-dce858fb45b497ec92980870d3b09d6c035b2401.tar.gz | |
- libbgl-wiz requires spirit-1.8, so don't build it on FreeBSD 4 unless
gcc-3.4 is used [1]. This fixes the build on FreeBSD 4.x.
- Install libboost_serialization.so as libboost_serialization.so.3 and
create a symlink. [2]
Reported by: many [1], bmah [2]
PR: ports/102524
Diffstat (limited to 'devel/boost')
| -rw-r--r-- | devel/boost/Makefile | 8 | ||||
| -rw-r--r-- | devel/boost/pkg-plist | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/devel/boost/Makefile b/devel/boost/Makefile index 67c0e52..1cdb985 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -39,8 +39,8 @@ OPTIONS= VERBOSE_BUILD "Show compiler messages" off \ UNIQ= /usr/bin/uniq BOOST_LIBS= date_time filesystem iostreams prg_exec_monitor\ - program_options regex signals test_exec_monitor\ - unit_test_framework + program_options regex serialization signals\ + test_exec_monitor unit_test_framework BOOST_SHARED_LIB_VER= 3 PKGMESSAGE= ${WRKDIR}/pkg-message @@ -100,6 +100,7 @@ SPIRIT_VERSION= 1.6.2 # - needs stlport # - spirit 1.6.x # - don't build wave +# - don't build libbgl-wiz (needs spirit 1.8) # WITH_GCC34: # - no wchar support .if ${OSVERSION} < 500000 @@ -141,6 +142,7 @@ BUILD_DEPENDS+= ${RUN_DEPENDS} # - wchar support # - spirit 1.8.x # - wave 1.2 +# - build libbgl-wiz .else BOOST_TOOLS= gcc EXTRA_PATCHES= ${FILESDIR}/FBSD5-patch-boost::python::detail::config.hpp @@ -283,11 +285,13 @@ do-build: "-sTOOLS=${BOOST_TOOLS}" "-sBUILD=${BJAM_BUILD}"\ ${BOOST_STL_OPTS} ${BOOST_ICU_OPTS} +.if ${OSVERSION} >= 500000 || defined(WITH_GCC34) # build bgl-viz library cd ${WRKSRC}/libs/graph/build && \ ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX}\ "-sTOOLS=${BOOST_TOOLS}" "-sBUILD=${BJAM_BUILD}"\ ${BOOST_STL_OPTS} ${BOOST_ICU_OPTS} +.endif # build random device code cd ${WRKSRC}/libs/random && \ diff --git a/devel/boost/pkg-plist b/devel/boost/pkg-plist index dc5120e..286d63c 100644 --- a/devel/boost/pkg-plist +++ b/devel/boost/pkg-plist @@ -3366,7 +3366,7 @@ lib/libboost_date_time.so.3 lib/libboost_filesystem.a lib/libboost_filesystem.so lib/libboost_filesystem.so.3 -lib/libbgl-viz.a +%%BOOST_SPIRIT_1.8%%lib/libbgl-viz.a lib/libboost_prg_exec_monitor.a lib/libboost_prg_exec_monitor.so lib/libboost_prg_exec_monitor.so.3 @@ -3385,6 +3385,7 @@ lib/libboost_regex.so lib/libboost_regex.so.3 lib/libboost_serialization.a lib/libboost_serialization.so +lib/libboost_serialization.so.3 lib/libboost_signals.a lib/libboost_signals.so lib/libboost_signals.so.3 |
