Date: Thu, 7 Nov 2013 15:37:32 +0000 (UTC) From: Cheng-Lung Sung <clsung@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333122 - in head/devel/glog: . files Message-ID: <201311071537.rA7FbWpm039100@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: clsung Date: Thu Nov 7 15:37:32 2013 New Revision: 333122 URL: http://svnweb.freebsd.org/changeset/ports/333122 Log: convert to STAGE Added: head/devel/glog/files/ head/devel/glog/files/patch-stl_logging.h.in (contents, props changed) Modified: head/devel/glog/Makefile Modified: head/devel/glog/Makefile ============================================================================== --- head/devel/glog/Makefile Thu Nov 7 15:35:14 2013 (r333121) +++ head/devel/glog/Makefile Thu Nov 7 15:37:32 2013 (r333122) @@ -13,14 +13,13 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/ gflags:${PORTSDIR}/devel/gflags GNU_CONFIGURE= yes -USES= pathfix +USES= pathfix USE_LDCONFIG= yes PROJECTHOST= google-glog CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -NO_STAGE= yes .include <bsd.port.pre.mk> post-patch: @@ -30,7 +29,7 @@ post-patch: ${WRKSRC}/Makefile.in .endif -#regression-test: -# cd ${WRKSRC}; ${MAKE} check +regression-test: + cd ${WRKSRC}; ${MAKE} check .include <bsd.port.post.mk> Added: head/devel/glog/files/patch-stl_logging.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/glog/files/patch-stl_logging.h.in Thu Nov 7 15:37:32 2013 (r333122) @@ -0,0 +1,28 @@ +--- src/glog/stl_logging.h.in.orig 2013-01-09 21:57:36.000000000 +0800 ++++ src/glog/stl_logging.h.in 2013-09-20 19:39:39.000000000 +0800 +@@ -53,8 +53,12 @@ + #ifdef __GNUC__ + # include <ext/hash_set> + # include <ext/hash_map> ++#ifdef _LIBCPP_VERSION ++# include <forward_list> ++#else + # include <ext/slist> + #endif ++#endif + + // Forward declare these two, and define them after all the container streams + // operators so that we can recurse from pair -> container -> container -> pair +@@ -81,8 +85,12 @@ OUTPUT_TWO_ARG_CONTAINER(std::vector) + OUTPUT_TWO_ARG_CONTAINER(std::deque) + OUTPUT_TWO_ARG_CONTAINER(std::list) + #ifdef __GNUC__ ++#ifdef _LIBCPP_VERSION ++OUTPUT_TWO_ARG_CONTAINER(std::forward_list) ++#else + OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) + #endif ++#endif + + #undef OUTPUT_TWO_ARG_CONTAINER +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311071537.rA7FbWpm039100>