Sun Oct 25 12:59:26 2020 UTC ()
googletest: Require a c++11 compiler with GCC_REQD.

Do not set USE_LANGUAGES, this passes -std=c++11 by itself.


(nia)
diff -r1.18 -r1.19 pkgsrc/devel/googletest/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/googletest/buildlink3.mk
cvs diff -r1.18 -r1.19 pkgsrc/devel/googletest/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/googletest/Makefile 2020/04/07 21:36:58 1.18
+++ pkgsrc/devel/googletest/Makefile 2020/10/25 12:59:26 1.19
@@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
1# $NetBSD: Makefile,v 1.18 2020/04/07 21:36:58 adam Exp $ 1# $NetBSD: Makefile,v 1.19 2020/10/25 12:59:26 nia Exp $
2 2
3DISTNAME= googletest-1.10.0 3DISTNAME= googletest-1.10.0
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
6GITHUB_TAG= release-${PKGVERSION_NOREV} 6GITHUB_TAG= release-${PKGVERSION_NOREV}
7 7
8MAINTAINER= reed@reedmedia.net 8MAINTAINER= reed@reedmedia.net
9HOMEPAGE= https://github.com/google/googletest 9HOMEPAGE= https://github.com/google/googletest
10COMMENT= Google's C++ testing framework 10COMMENT= Google's C++ testing framework
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13INSTALLATION_DIRS= bin 13INSTALLATION_DIRS= bin
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_LANGUAGES= c c++11 16USE_LANGUAGES= c c++
 17
 18# cc1plus: error: unrecognized command line option "-std=c++11"
 19GCC_REQD+= 4.8
17 20
18PKGCONFIG_OVERRIDE+= googlemock/cmake/gmock.pc.in 21PKGCONFIG_OVERRIDE+= googlemock/cmake/gmock.pc.in
19PKGCONFIG_OVERRIDE+= googlemock/cmake/gmock_main.pc.in 22PKGCONFIG_OVERRIDE+= googlemock/cmake/gmock_main.pc.in
20PKGCONFIG_OVERRIDE+= googletest/cmake/gtest.pc.in 23PKGCONFIG_OVERRIDE+= googletest/cmake/gtest.pc.in
21PKGCONFIG_OVERRIDE+= googletest/cmake/gtest_main.pc.in 24PKGCONFIG_OVERRIDE+= googletest/cmake/gtest_main.pc.in
22 25
23.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/googletest/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/googletest/buildlink3.mk 2020/04/07 21:36:58 1.2
+++ pkgsrc/devel/googletest/buildlink3.mk 2020/10/25 12:59:26 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.2 2020/04/07 21:36:58 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2020/10/25 12:59:26 nia Exp $
2 2
3BUILDLINK_TREE+= googletest 3BUILDLINK_TREE+= googletest
4 4
5.if !defined(GOOGLETEST_BUILDLINK3_MK) 5.if !defined(GOOGLETEST_BUILDLINK3_MK)
6GOOGLETEST_BUILDLINK3_MK:= 6GOOGLETEST_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.googletest+= googletest>=1.4.0 8BUILDLINK_API_DEPENDS.googletest+= googletest>=1.4.0
9BUILDLINK_DEPMETHOD.googletest?= build 9BUILDLINK_DEPMETHOD.googletest?= build
10BUILDLINK_PKGSRCDIR.googletest?= ../../devel/googletest 10BUILDLINK_PKGSRCDIR.googletest?= ../../devel/googletest
 11
 12GCC_REQD+= 4.8
11.endif # GOOGLETEST_BUILDLINK3_MK 13.endif # GOOGLETEST_BUILDLINK3_MK
12 14
13BUILDLINK_TREE+= -googletest 15BUILDLINK_TREE+= -googletest