diff options
| author | joerg <joerg@pkgsrc.org> | 2013-05-09 13:50:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-05-09 13:50:14 +0000 |
| commit | 7e971c685d0e9d080373c15ec7ad710d58a29da9 (patch) | |
| tree | 0d7d380b8403d2ad6b6b81905902101a6ee749fb /devel/google-glog | |
| parent | bf8771b7730117a8a78db565de117d8ab1c032e1 (diff) | |
| download | pkgsrc-7e971c685d0e9d080373c15ec7ad710d58a29da9.tar.gz | |
libc++ doesn't provide libstdc++'s ext/slist.h, so don't use it.
Diffstat (limited to 'devel/google-glog')
| -rw-r--r-- | devel/google-glog/Makefile | 7 | ||||
| -rw-r--r-- | devel/google-glog/distinfo | 3 | ||||
| -rw-r--r-- | devel/google-glog/patches/patch-src_glog_stl__logging.h.in | 25 |
3 files changed, 33 insertions, 2 deletions
diff --git a/devel/google-glog/Makefile b/devel/google-glog/Makefile index c44d64a9706..3ed5574ac65 100644 --- a/devel/google-glog/Makefile +++ b/devel/google-glog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/02/26 10:24:50 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2013/05/09 13:50:14 joerg Exp $ # DISTNAME= glog-0.3.3 @@ -24,6 +24,11 @@ PKGCONFIG_OVERRIDE+= libglog.pc.in LIBS+= -lexecinfo .endif +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 +.endif + .include "../../devel/googletest/buildlink3.mk" .include "../../devel/gmock/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/google-glog/distinfo b/devel/google-glog/distinfo index 28efe4b48d1..c4bd31d9cca 100644 --- a/devel/google-glog/distinfo +++ b/devel/google-glog/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2013/02/08 22:06:37 tonnerre Exp $ +$NetBSD: distinfo,v 1.2 2013/05/09 13:50:14 joerg Exp $ SHA1 (glog-0.3.3.tar.gz) = ed40c26ecffc5ad47c618684415799ebaaa30d65 RMD160 (glog-0.3.3.tar.gz) = 27fb1bd4156f6715b84d59293d96d1cadc79ea7a Size (glog-0.3.3.tar.gz) = 509676 bytes +SHA1 (patch-src_glog_stl__logging.h.in) = c86472e0f87ca99e91a5ecdb8c33affdb6679c26 diff --git a/devel/google-glog/patches/patch-src_glog_stl__logging.h.in b/devel/google-glog/patches/patch-src_glog_stl__logging.h.in new file mode 100644 index 00000000000..222c4b06959 --- /dev/null +++ b/devel/google-glog/patches/patch-src_glog_stl__logging.h.in @@ -0,0 +1,25 @@ +$NetBSD: patch-src_glog_stl__logging.h.in,v 1.1 2013/05/09 13:50:14 joerg Exp $ + +--- src/glog/stl_logging.h.in.orig 2013-05-04 15:12:09.000000000 +0000 ++++ src/glog/stl_logging.h.in +@@ -53,7 +53,9 @@ + #ifdef __GNUC__ + # include <ext/hash_set> + # include <ext/hash_map> +-# include <ext/slist> ++# ifndef _LIBCPP_VERSION ++# include <ext/slist> ++# endif + #endif + + // Forward declare these two, and define them after all the container streams +@@ -81,7 +83,9 @@ OUTPUT_TWO_ARG_CONTAINER(std::vector) + OUTPUT_TWO_ARG_CONTAINER(std::deque) + OUTPUT_TWO_ARG_CONTAINER(std::list) + #ifdef __GNUC__ ++# ifndef _LIBCPP_VERSION + OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) ++# endif + #endif + + #undef OUTPUT_TWO_ARG_CONTAINER |