Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2014 10:57:02 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342417 - head/devel/libc++
Message-ID:  <201402031057.s13Av2G1036178@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Feb  3 10:57:02 2014
New Revision: 342417
URL: http://svnweb.freebsd.org/changeset/ports/342417
QAT: https://qat.redports.org/buildarchive/r342417/

Log:
  Update to libc++ r200683
  This include fixes that makes it usable by all g++ version we have

Modified:
  head/devel/libc++/Makefile
  head/devel/libc++/Makefile.svn_rev
  head/devel/libc++/distinfo

Modified: head/devel/libc++/Makefile
==============================================================================
--- head/devel/libc++/Makefile	Mon Feb  3 10:50:30 2014	(r342416)
+++ head/devel/libc++/Makefile	Mon Feb  3 10:57:02 2014	(r342417)
@@ -25,8 +25,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if exists(/usr/lib/libcxxrt.so)
 CXXRT_INCS=	/usr/include/c++/v1/
+CXXRT_LIB=	/usr/lib/libcxxrt.so
 .else
-CXXRT_INCS=	/usr/local/include/cxxrt/
+CXXRT_INCS=	${LOCALBASE}/include/cxxrt/
+CXXRT_LIB=	${LOCALBASE}/lib/libcxxrt.so
 .endif
 
 CMAKE_ARGS=	-DLIBCXX_CXX_ABI=libcxxrt -DLIBCXX_LIBCXXRT_INCLUDE_PATHS=${CXXRT_INCS}
@@ -55,8 +57,8 @@ post-install:
 	${LN} -sf c++/v1 ${STAGEDIR}${PREFIX}/include/c++/v1/tr1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libc++.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/c++/
-	${ECHO} 'GROUP ( ${PREFIX}/lib/libc++.so.1 ${LOCALBASE}/lib/libcxxrt.so)' > ${STAGEDIR}${PREFIX}/lib/libc++.so
-	${ECHO} 'GROUP ( ${PREFIX}/lib/libc++.so.1 ${LOCALBASE}/lib/libcxxrt.so)' > ${STAGEDIR}${PREFIX}/lib/c++/libstdc++.so
+	${ECHO} 'GROUP ( ${PREFIX}/lib/libc++.so.1 ${CXXRT_LIB})' > ${STAGEDIR}${PREFIX}/lib/libc++.so
+	${ECHO} 'GROUP ( ${PREFIX}/lib/libc++.so.1 ${CXXRT_LIB})' > ${STAGEDIR}${PREFIX}/lib/c++/libstdc++.so
 
 regression-test: build
 	cd ${WRKSRC}/test && ${SH} ./testit

Modified: head/devel/libc++/Makefile.svn_rev
==============================================================================
--- head/devel/libc++/Makefile.svn_rev	Mon Feb  3 10:50:30 2014	(r342416)
+++ head/devel/libc++/Makefile.svn_rev	Mon Feb  3 10:57:02 2014	(r342417)
@@ -1 +1 @@
-SVN_REV=  200401
+SVN_REV=  200683

Modified: head/devel/libc++/distinfo
==============================================================================
--- head/devel/libc++/distinfo	Mon Feb  3 10:50:30 2014	(r342416)
+++ head/devel/libc++/distinfo	Mon Feb  3 10:57:02 2014	(r342417)
@@ -1,2 +1,2 @@
-SHA256 (libc++-200401.tar.xz) = 7ccb493d658a46bb0187283cf9c9345989dc5a4a981f29efa0df1f44578e8a6f
-SIZE (libc++-200401.tar.xz) = 856836
+SHA256 (libc++-200683.tar.xz) = a9771ae4d6151fa9c7ca5a3cb9f00492ddc1f165d38dc6461a8876a5abe4711f
+SIZE (libc++-200683.tar.xz) = 863432



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402031057.s13Av2G1036178>