svn commit: r363820 - in head: lib/googletest/gtest share/mk

[Kyle Evans]

Author: kevans
Date: Tue Aug  4 02:18:24 2020
New Revision: 363820
URL: https://svnweb.freebsd.org/changeset/base/363820

Log:
  gtest: link against libregex for GNU extensions
  
  gtest tests want to use \w ([[:alnum:]]) at the very least, which was
  causing them to fail after r363679.
  
  Start linking against libregex so that this shorthand is implemented.
  
  PR:		248452

Modified:
  head/lib/googletest/gtest/Makefile
  head/share/mk/src.libnames.mk

Modified: head/lib/googletest/gtest/Makefile
==============================================================================
--- head/lib/googletest/gtest/Makefile	Tue Aug  4 02:16:43 2020	(r363819)
+++ head/lib/googletest/gtest/Makefile	Tue Aug  4 02:18:24 2020	(r363820)
@@ -45,7 +45,7 @@ INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest.h
 
 SRCS+=		gtest-all.cc
 
-LIBADD+=	pthread
+LIBADD+=	pthread regex
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Tue Aug  4 02:16:43 2020	(r363819)
+++ head/share/mk/src.libnames.mk	Tue Aug  4 02:18:24 2020	(r363820)
@@ -320,7 +320,7 @@ _DP_dpv=	dialog figpar util ncursesw
 _DP_dialog=	ncursesw m
 _DP_cuse=	pthread
 _DP_atf_cxx=	atf_c
-_DP_gtest=	pthread
+_DP_gtest=	pthread regex
 _DP_gmock=	gtest
 _DP_gmock_main=	gmock
 _DP_gtest_main=	gtest