Update to latest commit

This includes OpenBSD specific fixes for gtest's own tests as well as
updates required by (future) consumers such as devel/abseil-cpp.

Fixes upstreamed, diff and tests (amd64, macppc) from Andrew Krasavin.
Similar diff and more tests incl. consumers from op.
Input on using ${version}pl${commit} from sthen and bentley.

OK op
This commit is contained in:
kn 2022-02-13 11:15:33 +00:00
parent af864f388f
commit 6eb368346a
3 changed files with 21 additions and 32 deletions

View File

@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.26 2022/02/08 09:31:46 kn Exp $
# $OpenBSD: Makefile,v 1.27 2022/02/13 11:15:33 kn Exp $
# http://build-failures.rhaalovely.net//alpha/2017-11-19/devel/gtest.log
BROKEN-alpha = googletest/test/gtest_unittest.cc:2730: error: unrecognizable insn:
COMMENT = C++ unit test framework
V= 1.8.1
GH_ACCOUNT= google
GH_PROJECT= googletest
GH_TAGNAME= release-$V
PKGNAME = gtest-$V
GH_COMMIT= 06519cedc3159de8b36a504766ad6b7966555f10
DISTNAME= gtest-1.11.0pl20220208
SHARED_LIBS += gmock 0.1 # .0.0
SHARED_LIBS += gmock_main 0.1 # .0.0
SHARED_LIBS += gtest 1.1 # .0.0
SHARED_LIBS += gtest_main 1.1 # .0.0
SHARED_LIBS += gmock 1.0 # .0.0
SHARED_LIBS += gmock_main 1.0 # .0.0
SHARED_LIBS += gtest 2.0 # .0.0
SHARED_LIBS += gtest_main 2.0 # .0.0
CATEGORIES = devel
@ -28,11 +27,9 @@ CXXFLAGS += -mxgot
# New BSD
PERMIT_PACKAGE = Yes
SEPARATE_BUILD = Yes
WANTLIB = m ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
@ -41,4 +38,9 @@ MODPY_RUNDEP = No
CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON \
-Dgtest_build_tests=ON
# c++ standard must be the same as in devel/abseil-cpp,
# otherwise the build of abseil tests will end with an error
# see https://github.com/abseil/abseil-cpp/issues/819
CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=17
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (googletest-1.8.1.tar.gz) = m/H+UYKmBLQTXtwaQlrjVsmtFemyP58SoC6AGEw6JJw=
SIZE (googletest-1.8.1.tar.gz) = 992298
SHA256 (gtest-1.11.0pl20220208-06519ced.tar.gz) = sRI4OZi04SMfIwCe725y3/CchJ110HBAZa2XOcxh9LA=
SIZE (gtest-1.11.0pl20220208-06519ced.tar.gz) = 835586

View File

@ -1,36 +1,29 @@
@comment $OpenBSD: PLIST,v 1.4 2021/10/31 16:09:26 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2022/02/13 11:15:33 kn Exp $
include/gmock/
include/gmock/gmock-actions.h
include/gmock/gmock-cardinalities.h
include/gmock/gmock-generated-actions.h
include/gmock/gmock-generated-actions.h.pump
include/gmock/gmock-generated-function-mockers.h
include/gmock/gmock-generated-function-mockers.h.pump
include/gmock/gmock-generated-matchers.h
include/gmock/gmock-generated-matchers.h.pump
include/gmock/gmock-generated-nice-strict.h
include/gmock/gmock-generated-nice-strict.h.pump
include/gmock/gmock-function-mocker.h
include/gmock/gmock-matchers.h
include/gmock/gmock-more-actions.h
include/gmock/gmock-more-matchers.h
include/gmock/gmock-nice-strict.h
include/gmock/gmock-spec-builders.h
include/gmock/gmock.h
include/gmock/internal/
include/gmock/internal/custom/
include/gmock/internal/custom/README.md
include/gmock/internal/custom/gmock-generated-actions.h
include/gmock/internal/custom/gmock-generated-actions.h.pump
include/gmock/internal/custom/gmock-matchers.h
include/gmock/internal/custom/gmock-port.h
include/gmock/internal/gmock-generated-internal-utils.h
include/gmock/internal/gmock-generated-internal-utils.h.pump
include/gmock/internal/gmock-internal-utils.h
include/gmock/internal/gmock-port.h
include/gmock/internal/gmock-pp.h
include/gtest/
include/gtest/gtest-assertion-result.h
include/gtest/gtest-death-test.h
include/gtest/gtest-matchers.h
include/gtest/gtest-message.h
include/gtest/gtest-param-test.h
include/gtest/gtest-param-test.h.pump
include/gtest/gtest-printers.h
include/gtest/gtest-spi.h
include/gtest/gtest-test-part.h
@ -47,17 +40,11 @@ include/gtest/internal/custom/gtest.h
include/gtest/internal/gtest-death-test-internal.h
include/gtest/internal/gtest-filepath.h
include/gtest/internal/gtest-internal.h
include/gtest/internal/gtest-linked_ptr.h
include/gtest/internal/gtest-param-util-generated.h
include/gtest/internal/gtest-param-util-generated.h.pump
include/gtest/internal/gtest-param-util.h
include/gtest/internal/gtest-port-arch.h
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-string.h
include/gtest/internal/gtest-tuple.h
include/gtest/internal/gtest-tuple.h.pump
include/gtest/internal/gtest-type-util.h
include/gtest/internal/gtest-type-util.h.pump
lib/cmake/
lib/cmake/GTest/
lib/cmake/GTest/GTestConfig.cmake