diff options
| -rw-r--r-- | devel/glog/Makefile | 7 | ||||
| -rw-r--r-- | devel/glog/files/patch-stl_logging.h.in | 28 |
2 files changed, 31 insertions, 4 deletions
diff --git a/devel/glog/Makefile b/devel/glog/Makefile index bf9241c07381..c6ab471386f7 100644 --- a/devel/glog/Makefile +++ b/devel/glog/Makefile @@ -13,14 +13,13 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ 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> diff --git a/devel/glog/files/patch-stl_logging.h.in b/devel/glog/files/patch-stl_logging.h.in new file mode 100644 index 000000000000..d3449a748efe --- /dev/null +++ b/devel/glog/files/patch-stl_logging.h.in @@ -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 + |