Re: UPDATE: gtest 1.11.0 + some patches from upstream

Klemens Nanni <kn@openbsd.org> writes:

> On Tue, Feb 08, 2022 at 09:46:09AM +0100, Omar Polo wrote:
> [...]
>> so OK for gtest as long as you don't forget to fix msgpack too :)
>>
>> (a revision bump shouldn't be needed in this case, since gtest is
>> bumping SHARED_LIBS too, but maybe to play on the safe side a bump is
>> required?)
>
> msgpack does register gtest in WANTLIB and has no LIB_DEPENDS on it, so
> I don't see how msgpack be rebuilt automatically due to the bump, so
> a REVISION bump is needed.
>
> I also expect this to change to change regardless of gtest, so another
> reason for me to bump.

agreed on your reasoning and my bad for not checking WANTLIB...

> REVISION bump does not cost anything, so I'd just bump it.
>
> I'd even bump the version spec since we explicitly require the new gtest
> version that is built with c++17 now.
>
>> thanks Andrew for the msgpack fix
>
> OK for this after updating gtest?

I'm not 100% sure that the version check is actually required in this
case, I leave it to others to judge that, but for the rest, sure, OK op

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/msgpack/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 14 Feb 2020 11:11:32 -0000 1.12
> +++ Makefile 8 Feb 2022 09:37:58 -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.0.20220207
> +TEST_DEPENDS = devel/gtest>=1.11.0.20220207
> +
> +# match standard version with gtest
> +CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=17
>
> pre-configure:
> cd ${WRKSRC} && sed -i 's,-Werror -g -O3,,' CMakeLists.txt \