Date: Sat, 24 Nov 2012 02:46:14 +1100 (VLAT) From: Dima Panov <fluffy@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173865: let Boost to use proper toolset with clang Message-ID: <201211231546.qANFkEGO039328@Beastie.Fluffy.Khv.RU> Resent-Message-ID: <201211231550.qANFo3n2071879@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173865
>Category: ports
>Synopsis: let Boost to use proper toolset with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 23 15:50:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 10.0-1000024-CURRENT amd64
>Organization:
Twilight Zone
>Environment:
System: FreeBSD Beastie.Fluffy.Khv.RU 10.0-1000024-CURRENT FreeBSD 10.0-1000024-CURRENT #0 r242769M: Fri Nov 9 10:13:26 VLAT 2012 toor@Beastie.Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot amd64
>Description:
Currently, port's makefile refers only gcc toolset,
but for clang Boost package have own presets
>How-To-Repeat:
>Fix:
Index: devel/boost-all/compiled.mk
===================================================================
--- devel/boost-all/compiled.mk (revision 307672)
+++ devel/boost-all/compiled.mk (working copy)
@@ -1,5 +1,4 @@
-USE_GCC= 4.2+
USE_LDCONFIG= yes
BOOST_SHARED_LIB_VER= 4
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -12,7 +11,12 @@
PKG_MESSAGE_FILE_THREADS= ${PORTSDIR}/devel/boost-all/pkg-message.threads
PKG_MESSAGE_FILE_PYTHON= ${PORTSDIR}/devel/boost-all/pkg-message.python
+.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024
+BOOST_TOOLS= clang
+.else
BOOST_TOOLS= gcc
+USE_GCC= 4.2+
+.endif
BJAM_OPTIONS= --layout=system --disable-long-double
BJAM_OPTIONS+= ${_MAKE_JOBS}
Index: devel/boost-jam/Makefile
===================================================================
--- devel/boost-jam/Makefile (revision 307672)
+++ devel/boost-jam/Makefile (working copy)
@@ -13,12 +13,17 @@
.include "${PORTSDIR}/devel/boost-all/common.mk"
BJAM= ${WRKSRC}/bjam
+.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024
+TOOLSET= clang
+.else
+TOOLSET= cc
+.endif
post-patch:
@${REINPLACE_CMD} -e '/toolset cc/,/;/ { /opt --release/d; }' ${WRKSRC}/tools/build/v2/engine/build.jam
do-build:
- cd ${WRKSRC} && ${MAKE_ENV} ./bootstrap.sh --with-toolset=cc --prefix=${PREFIX}
+ cd ${WRKSRC} && ${MAKE_ENV} ./bootstrap.sh --with-toolset=${TOOLSET} --prefix=${PREFIX}
do-install:
${MKDIR} ${PREFIX}/bin
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211231546.qANFkEGO039328>