CVS commit: pkgsrc/devel/googletest

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 25 12:59:26 UTC 2020

Modified Files:
        pkgsrc/devel/googletest: Makefile buildlink3.mk

Log Message:
googletest: Require a c++11 compiler with GCC_REQD.

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


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/googletest/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/googletest/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/googletest/Makefile
diff -u pkgsrc/devel/googletest/Makefile:1.18 pkgsrc/devel/googletest/Makefile:1.19
--- pkgsrc/devel/googletest/Makefile:1.18       Tue Apr  7 21:36:58 2020
+++ pkgsrc/devel/googletest/Makefile    Sun Oct 25 12:59:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/04/07 21:36:58 adam Exp $
+# $NetBSD: Makefile,v 1.19 2020/10/25 12:59:26 nia Exp $
 
 DISTNAME=      googletest-1.10.0
 CATEGORIES=    devel
@@ -13,7 +13,10 @@ LICENSE=     modified-bsd
 INSTALLATION_DIRS=     bin
 
 USE_CMAKE=             yes
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
+
+# cc1plus: error: unrecognized command line option "-std=c++11"
+GCC_REQD+=             4.8
 
 PKGCONFIG_OVERRIDE+=   googlemock/cmake/gmock.pc.in
 PKGCONFIG_OVERRIDE+=   googlemock/cmake/gmock_main.pc.in

Index: pkgsrc/devel/googletest/buildlink3.mk
diff -u pkgsrc/devel/googletest/buildlink3.mk:1.2 pkgsrc/devel/googletest/buildlink3.mk:1.3
--- pkgsrc/devel/googletest/buildlink3.mk:1.2   Tue Apr  7 21:36:58 2020
+++ pkgsrc/devel/googletest/buildlink3.mk       Sun Oct 25 12:59:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/07 21:36:58 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/10/25 12:59:26 nia Exp $
 
 BUILDLINK_TREE+=       googletest
 
@@ -8,6 +8,8 @@ GOOGLETEST_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.googletest+=     googletest>=1.4.0
 BUILDLINK_DEPMETHOD.googletest?=       build
 BUILDLINK_PKGSRCDIR.googletest?=       ../../devel/googletest
+
+GCC_REQD+=     4.8
 .endif # GOOGLETEST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -googletest