From b4af4f93c682e445bf159f0d1ec90b636296c946 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 4 Aug 2020 02:18:24 +0000 Subject: [PATCH] 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 --- lib/googletest/gtest/Makefile | 2 +- share/mk/src.libnames.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile index b580c33eb45a..103bf84db5b2 100644 --- a/lib/googletest/gtest/Makefile +++ b/lib/googletest/gtest/Makefile @@ -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 diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index f47e50fb94d5..c2c3d6c4110b 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -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