On Sat, Feb 12, 2022 at 10:52:56PM +0300, Andrew Krasavin wrote:
> On Wed, Feb 09, 2022 at 12:55:21AM -0700, Anthony J. Bentley wrote:
> > Klemens Nanni writes:
> > > > better with 1.11.0pl20220207 so that if there is another proper release
> > > > it won't need EPOCH
> > >
> > > What never version would require EPOCH?
> > > 1.11.1, 1.12.0 and 2.0.0 would all be greater than 1.11.0.20220207, no?
> >
> > 1.11.0.1 would require an EPOCH.
> >
> > Upstreams adding an extra digit is unusual but not that unusual.
> >
> > EPOCH is a giant pain. Small risk of a giant pain, versus zero risk.
> > For that reason, I prefer to use a pl suffix.
>
> Anthony, thanks for the valuable observation!
>
> The latest diff from Klemens does not include the C++ version change
> needed to successfully build the abseil-cpp tests, and my latest diff
> contains an error (duplicate MODULES).
Ah, thanks!
> Therefore, the following will be another version of diff. At the same
> time it will also be necessary to apply a diff to msgpack, otherwise
> its build will end up with an error.
>
> I will be glad to receive comments, objections, and suggestions.
> If there are none, it would be appreciated if someone would
> commit these changes.
gtest and msgpack build and package fine, gtest's tests pass 100%,
msgpack's tests pass 100% and both neovim and tmate still work with the
new msgpack -- on both amd64 and sparc64.
`make update-plist' adds tags for msgpack, though.
Feedback? OK?
> In any case, thank you.
>
> diff for devel/msgpack:
Separate diffs in the same mail are a bit annoying to apply, best send
one combined diff from the common directory, e.g.
cd /usr/ports
cvs diff devel/gtest devel/msgpack
Here it is with msgpack PLIST update and one trailing tab removed:
Index: devel/msgpack/Makefile
===================================================================
RCS file: /cvs/ports/devel/msgpack/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/msgpack/Makefile 14 Feb 2020 11:11:32 -0000 1.12
+++ devel/msgpack/Makefile 12 Feb 2022 22:51:52 -0000
@@ -7,6 +7,7 @@ GH_ACCOUNT = msgpack
GH_PROJECT = msgpack-c
GH_TAGNAME = cpp-${V}
DISTNAME = msgpack-${V}
+REVISION = 0
SHARED_LIBS += msgpackc 1.0 # 2.0
@@ -20,8 +21,11 @@ PERMIT_PACKAGE = Yes
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
-BUILD_DEPENDS = devel/gtest
-TEST_DEPENDS = devel/gtest
+BUILD_DEPENDS = devel/gtest>=1.11.0pl20220208
+TEST_DEPENDS = devel/gtest>=1.11.0pl20220208
+
+# match standard version with gtest
+CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=17
pre-configure:
cd ${WRKSRC} && sed -i 's,-Werror -g -O3,,' CMakeLists.txt \
Index: devel/msgpack/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/msgpack/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/msgpack/pkg/PLIST 16 Jun 2017 18:55:07 -0000 1.3
+++ devel/msgpack/pkg/PLIST 12 Feb 2022 23:22:10 -0000
@@ -737,6 +737,6 @@ lib/cmake/msgpack/msgpack-config-version
lib/cmake/msgpack/msgpack-config.cmake
lib/cmake/msgpack/msgpack-targets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/msgpack/msgpack-targets.cmake
-lib/libmsgpackc.a
+@static-lib lib/libmsgpackc.a
@lib lib/libmsgpackc.so.${LIBmsgpackc_VERSION}
lib/pkgconfig/msgpack.pc
Index: devel/gtest/Makefile
===================================================================
RCS file: /cvs/ports/devel/gtest/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- devel/gtest/Makefile 8 Feb 2022 09:31:46 -0000 1.26
+++ devel/gtest/Makefile 12 Feb 2022 22:51:59 -0000
@@ -5,16 +5,15 @@ BROKEN-alpha = googletest/test/gtest_uni
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
@@ -40,5 +37,10 @@ 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>
Index: devel/gtest/distinfo
===================================================================
RCS file: /cvs/ports/devel/gtest/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- devel/gtest/distinfo 31 Oct 2021 16:09:26 -0000 1.5
+++ devel/gtest/distinfo 12 Feb 2022 22:51:59 -0000
@@ -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
Index: devel/gtest/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gtest/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/gtest/pkg/PLIST 31 Oct 2021 16:09:26 -0000 1.4
+++ devel/gtest/pkg/PLIST 12 Feb 2022 22:51:59 -0000
@@ -2,35 +2,28 @@
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
No comments:
Post a Comment