On Fri, Aug 18, 2023 at 08:52:43AM +0200, Rafael Sadowski wrote:
> On Thu Aug 17, 2023 at 01:16:56PM +0200, Rafael Sadowski wrote:
> > Simple update googletest-1.14.0. Tested on amd64. I think this is a
> > candidate for a bulk build.
> > 
> > Cheers Rafael
> > 
> 
> Thanks Antoine and Stuart for your feedback. I was too fast and too
> careless.  Here is a new diff with following changes:
> 
> - Bring back the gtest DISTNAME.
> - Remove HOMEPAGE, this comes from GH_*
> - Remove CMAKE_CXX_STANDARD (Upstream fixed and my devel/abseil-cpp
>   update is happy)
> - Fix typo
> 
> I built a handful costumer an all are running with out issues

Looks good.
OK ports wise.

> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/gtest/Makefile,v
> retrieving revision 1.30
> diff -u -p -u -p -r1.30 Makefile
> --- Makefile  20 Feb 2023 16:35:20 -0000      1.30
> +++ Makefile  17 Aug 2023 19:16:30 -0000
> @@ -1,22 +1,18 @@
> -# 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.14.0
>  GH_ACCOUNT=  google
>  GH_PROJECT=  googletest
> -GH_COMMIT=   06519cedc3159de8b36a504766ad6b7966555f10
> -DISTNAME=    gtest-1.11.0pl20220208
> +GH_TAGNAME=  v${V}
> +DISTNAME=    gtest-${V}
>  
> -SHARED_LIBS +=       gmock           1.0   # .0.0
> +SHARED_LIBS +=       gmock           2.0   # .0.0
>  SHARED_LIBS +=       gmock_main      1.0   # .0.0
> -SHARED_LIBS +=       gtest           2.0   # .0.0
> +SHARED_LIBS +=       gtest           3.0   # .0.0
>  SHARED_LIBS +=       gtest_main      2.0   # .0.0
>  
>  CATEGORIES = devel
>  
> -HOMEPAGE =   https://github.com/google/googletest
> -
>  .include <bsd.port.arch.mk>
>  .if ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
>  CXXFLAGS +=  -mxgot
> @@ -36,12 +32,7 @@ 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
> -
> -# evertyhing except tests
> +# everything except tests
>  ALL_TARGET =         gmock gmock_main gtest gtest_main
>  
>  # build whatever is left (ca. 102 C++ test files)
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/gtest/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo  13 Feb 2022 11:15:33 -0000      1.6
> +++ distinfo  17 Aug 2023 19:16:30 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gtest-1.11.0pl20220208-06519ced.tar.gz) = 
> sRI4OZi04SMfIwCe725y3/CchJ110HBAZa2XOcxh9LA=
> -SIZE (gtest-1.11.0pl20220208-06519ced.tar.gz) = 835586
> +SHA256 (gtest-1.14.0.tar.gz) = itWYxzrXluDYKAsILOvYKmMNc+c808cAV5OKZQG7pdc=
> +SIZE (gtest-1.14.0.tar.gz) = 867764

-- 
Antoine

Reply via email to