1 files changed, 41 insertions, 32 deletions
diff --git a/devel/boost-all/compiled.mk b/devel/boost-all/compiled.mk
index c24415d8e345..730673dd1bdf 100644
--- a/devel/boost-all/compiled.mk
+++ b/devel/boost-all/compiled.mk
@@ -1,51 +1,60 @@
-
-USE_GCC=	4.2+
 USE_LDCONFIG=	yes
-BOOST_SHARED_LIB_VER=	4
+BOOST_SHARED_LIB_VER=	5
 PKGMESSAGE=	${WRKDIR}/pkg-message
 MAKE_JOBS_SAFE=	yes
 BJAM=		bjam
-CXXFLAGS+=	-Wno-long-long
 
 PLIST_SUB+=	BOOST_SHARED_LIB_VER=${BOOST_SHARED_LIB_VER}
 
 PKG_MESSAGE_FILE_THREADS=	${PORTSDIR}/devel/boost-all/pkg-message.threads
 PKG_MESSAGE_FILE_PYTHON=	${PORTSDIR}/devel/boost-all/pkg-message.python
 
-BOOST_TOOLS=	gcc
+BJAM_ARGS=	--layout=system \
+		--prefix=${PREFIX}
+
+.if ${ARCH} == amd64
+BJAM_ARGS+=	cxxflags=-fPIC
+.endif
+
+NO_CCACHE=	yes
+.if ${CC:T:Mgcc*}
+BOOST_TOOLSET:=	gcc
+.elif ${CC:T:Mclang}
+BOOST_TOOLSET:=	clang
+.else
+_COMPILER_VERSION!=	${CC} --version
+. if ${_COMPILER_VERSION:Mgcc}
+BOOST_TOOLSET:=	gcc
+. elif ${_COMPILER_VERSION:M\(GCC\)}
+BOOST_TOOLSET:=	gcc
+. elif ${_COMPILER_VERSION:Mclang}
+BOOST_TOOLSET:=	clang
+. else
+.error Unable to determine compiler type for ${CC}
+. endif
+. undef _COMPILER_VERSION
+.endif
 
-BJAM_OPTIONS=	--layout=system --disable-long-double
-BJAM_OPTIONS+=	${_MAKE_JOBS}
-.if defined (WITH_VERBOSE_BUILD)
-BJAM_OPTIONS+=	-d2
+BJAM_ARGS+=	--toolset=${BOOST_TOOLSET} \
+		${_MAKE_JOBS}
+.if ${PORT_OPTIONS:MVERBOSE_BUILD}
+BJAM_ARGS+=	-d2
 .endif
 
-.if defined (WITHOUT_DEBUG)
-BJAM_OPTIONS+=	variant=release
+.if ${PORT_OPTIONS:MDEBUG}
+BJAM_ARGS+=	debug
 .else
-BJAM_OPTIONS+=	variant=debug
+BJAM_ARGS+=	release
 .endif
 
-BJAM_OPTIONS+=	threading=multi
+BJAM_ARGS+=	threading=multi \
+		link=shared,static
 
-# Unless WITH_OPTIMIZED_CFLAGS is defined, the port uses
-# CXXFLAGS as defined by the user (overridng Boost's 'speed'
-# configuration scheme
-BJAM_OPTIONS+=	optimization=speed
-.if defined (WITH_OPTIMIZED_CFLAGS)
-BJAM_OPTIONS+=	inlining=full
-CXXFLAGS+=	-O3
+BJAM_ARGS+=	optimization=speed
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+BJAM_ARGS+=	inlining=full
 .endif
 
-customize-boost-build:
-# 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}|'\
-	${WRKSRC}/tools/build/v2/tools/gcc.jam
-
-	@${REINPLACE_CMD}\
-		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:S/-//}|'\
-	${WRKSRC}/tools/build/v2/tools/python.jam
+post-patch:
+	@${REINPLACE_CMD} -e 's|${PORTVERSION}|${BOOST_SHARED_LIB_VER}|g' \
+		${WRKSRC}/Jamroot