svn commit: r513801 - in head: databases/clickhouse devel/android-tools-adb/files devel/android-tools-simpleperf/files devel/googlemock devel/googlemock/files devel/googletest devel/googletest/file...
Jan Beich
jbeich at FreeBSD.org
Sat Oct 5 00:42:25 UTC 2019
Author: jbeich
Date: Sat Oct 5 00:42:20 2019
New Revision: 513801
URL: https://svnweb.freebsd.org/changeset/ports/513801
Log:
devel/google{test,mock}: update to 1.10.0
- Drop static library
- Drop gtest-config and gmock-config
- Drop GTEST_LIB_CHECK autoconf macro
- Drop gmock_doctory.py as it's too old
- Expose tests via option
Changes: https://github.com/google/googletest/compare/release-1.8.1...release-1.10.0
Reported by: GitHub (watch releases)
PR: 239654
Differential Revision: https://reviews.freebsd.org/D19430
Deleted:
head/devel/googlemock/files/
head/devel/googletest/files/
Modified:
head/databases/clickhouse/Makefile (contents, props changed)
head/devel/android-tools-adb/files/Makefile (contents, props changed)
head/devel/android-tools-simpleperf/files/Makefile (contents, props changed)
head/devel/googlemock/Makefile (contents, props changed)
head/devel/googlemock/distinfo (contents, props changed)
head/devel/googlemock/pkg-plist (contents, props changed)
head/devel/googletest/Makefile (contents, props changed)
head/devel/googletest/distinfo (contents, props changed)
head/devel/googletest/pkg-plist (contents, props changed)
head/devel/msgpack/Makefile (contents, props changed)
head/finance/gnucash/Makefile (contents, props changed)
head/lang/cling/Makefile (contents, props changed)
head/math/yacas/Makefile (contents, props changed)
head/net-im/mtxclient/Makefile (contents, props changed)
head/science/libkml/Makefile (contents, props changed)
head/security/certificate-transparency/Makefile (contents, props changed)
Modified: head/databases/clickhouse/Makefile
==============================================================================
--- head/databases/clickhouse/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/databases/clickhouse/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -5,7 +5,7 @@ PORTNAME= clickhouse
PORTVERSION= 19.11.5.28
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= -stable
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
MAINTAINER= proler at gmail.com
Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/android-tools-adb/files/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -112,8 +112,8 @@ CFLAGS+= ${CPPFLAGS}
CXXFLAGS+= ${CPPFLAGS}
.endif
-TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
-TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags)
+TEST_CPPFLAGS+= $$(${PKG_CONFIG} gtest --cflags)
+TEST_CPPFLAGS+= $$(${PKG_CONFIG} gmock --cflags)
.for f in ${TEST_SRCS}
CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
.endfor
@@ -122,14 +122,12 @@ LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null
LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
LDADD+= \-lpthread
DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB}
-TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
-TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags)
+TEST_LDADD+= $$(${PKG_CONFIG} gtest --libs)
+TEST_LDADD+= $$(${PKG_CONFIG} gmock --libs)
TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
CLEANFILES+= ${PROG}_test ${TEST_OBJS}
-GTEST_CONFIG?= gtest-config
-GMOCK_CONFIG?= gmock-config
PKG_CONFIG?= pkg-config
beforeinstall:
Modified: head/devel/android-tools-simpleperf/files/Makefile
==============================================================================
--- head/devel/android-tools-simpleperf/files/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/android-tools-simpleperf/files/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -84,7 +84,7 @@ CFLAGS+= ${CPPFLAGS}
CXXFLAGS+= ${CPPFLAGS}
.endif
-TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+TEST_CPPFLAGS+= $$(${PKG_CONFIG} gtest --cflags)
.for f in ${TEST_SRCS}
CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
.endfor
@@ -93,13 +93,13 @@ LDADD!= ${LLVM_CONFIG} --system-libs --libs --ldflags
LDADD+= -lz \-lpthread
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223191#c3
LDADD:= ${LDADD:S,-l/usr/lib/libexecinfo.so,-lexecinfo,}
-TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
+TEST_LDADD+= $$(${PKG_CONFIG} gtest --libs)
TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
CLEANFILES+= ${PROG}_test ${TEST_OBJS}
LLVM_CONFIG?= llvm-config
-GTEST_CONFIG?= gtest-config
+PKG_CONFIG?= pkg-config
.include <bsd.prog.mk>
Modified: head/devel/googlemock/Makefile
==============================================================================
--- head/devel/googlemock/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googlemock/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -3,8 +3,7 @@
PORTNAME= googlemock
DISTVERSIONPREFIX= release-
-DISTVERSION= 1.8.1
-PORTREVISION= 2
+DISTVERSION= 1.10.0
CATEGORIES= devel
MAINTAINER= jbeich at FreeBSD.org
@@ -13,33 +12,27 @@ COMMENT= Library for writing and using C++ mock classe
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_pthread.m4:devel/autoconf-archive \
- googletest>=1.8.0:devel/googletest
LIB_DEPENDS= libgtest.so:devel/googletest
USE_GITHUB= yes
GH_ACCOUNT= google
GH_PROJECT= googletest
-USES= autoreconf compiler:c++11-lang libtool localbase python:run shebangfix
-SHEBANG_FILES= scripts/gmock_doctor.py
-WRKSRC_SUBDIR= ${PORTNAME}
-GNU_CONFIGURE= yes
-# fused-src python tests are only useful for bundling. There's no point in
-# running them before installing system-wide without source files.
-CONFIGURE_ENV= ac_cv_path_PYTHON=":"
-TEST_TARGET= check
-INSTALL_TARGET= install-strip
+USES= cmake compiler:c++11-lib
USE_LDCONFIG= yes
+CMAKE_ON= BUILD_GMOCK BUILD_SHARED_LIBS
-post-patch:
- @${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac
-# enable vendor make install again (revert 52277c9)
- @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
- ${WRKSRC}/Makefile.am
+OPTIONS_DEFINE= TEST
+TEST_USES= python:build
+TEST_CMAKE_BOOL= gmock_build_tests
+TEST_TEST_TARGET= test
+
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin
+# Clean unused stuff: googletest, unprocessed headers
+ ${FIND} ${STAGEDIR}${PREFIX} \( -ipath "*gtest*" -o \
+ -name '*.pump' -o -empty \) -delete
+
+pre-install-TEST-on: do-test
.include <bsd.port.mk>
Modified: head/devel/googlemock/distinfo
==============================================================================
--- head/devel/googlemock/distinfo Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googlemock/distinfo Sat Oct 5 00:42:20 2019 (r513801)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535728917
-SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
-SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298
+TIMESTAMP = 1570114335
+SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349
Modified: head/devel/googlemock/pkg-plist
==============================================================================
--- head/devel/googlemock/pkg-plist Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googlemock/pkg-plist Sat Oct 5 00:42:20 2019 (r513801)
@@ -1,27 +1,23 @@
-bin/gmock-config
-bin/gmock_doctor.py
include/gmock/gmock-actions.h
include/gmock/gmock-cardinalities.h
+include/gmock/gmock-function-mocker.h
include/gmock/gmock-generated-actions.h
include/gmock/gmock-generated-function-mockers.h
include/gmock/gmock-generated-matchers.h
-include/gmock/gmock-generated-nice-strict.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/custom/README.md
include/gmock/internal/custom/gmock-generated-actions.h
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-internal-utils.h
include/gmock/internal/gmock-port.h
-lib/libgmock.a
+include/gmock/internal/gmock-pp.h
lib/libgmock.so
-lib/libgmock.so.0
-lib/libgmock.so.0.0.0
-lib/libgmock_main.a
lib/libgmock_main.so
-lib/libgmock_main.so.0
-lib/libgmock_main.so.0.0.0
+libdata/pkgconfig/gmock.pc
+libdata/pkgconfig/gmock_main.pc
Modified: head/devel/googletest/Makefile
==============================================================================
--- head/devel/googletest/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googletest/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -3,8 +3,7 @@
PORTNAME= googletest
DISTVERSIONPREFIX= release-
-DISTVERSION= 1.8.1
-PORTREVISION= 3
+DISTVERSION= 1.10.0
CATEGORIES= devel
MAINTAINER= jbeich at FreeBSD.org
@@ -16,28 +15,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= google
-USES= autoreconf compiler:c++11-lang libtool
-WRKSRC_SUBDIR= ${PORTNAME}
-GNU_CONFIGURE= yes
-# fused-src python tests are only useful for bundling. There's no point in
-# running them before installing system-wide without source files.
-CONFIGURE_ENV= ac_cv_path_PYTHON=":"
-TEST_TARGET= check
-INSTALL_TARGET= install-strip
+USES= cmake compiler:c++11-lib
USE_LDCONFIG= yes
+CMAKE_ON= BUILD_SHARED_LIBS
+CMAKE_OFF= BUILD_GMOCK
-# googletest requires pthread in order to function and does not properly
-# detect pthread support.
-#
-# See: https://github.com/google/googletest/issues/2162
-LIBS+= -lpthread
+OPTIONS_DEFINE= TEST
-post-patch:
-# enable vendor make install again (revert 661758e)
- @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \
- ${WRKSRC}/Makefile.am
+TEST_USES= python:build
+TEST_CMAKE_BOOL= gtest_build_tests
+TEST_TEST_TARGET= test
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin
+pre-install-TEST-on: do-test
.include <bsd.port.mk>
Modified: head/devel/googletest/distinfo
==============================================================================
--- head/devel/googletest/distinfo Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googletest/distinfo Sat Oct 5 00:42:20 2019 (r513801)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535728917
-SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
-SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298
+TIMESTAMP = 1570114335
+SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349
Modified: head/devel/googletest/pkg-plist
==============================================================================
--- head/devel/googletest/pkg-plist Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/googletest/pkg-plist Sat Oct 5 00:42:20 2019 (r513801)
@@ -1,5 +1,5 @@
-bin/gtest-config
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-printers.h
@@ -9,26 +9,24 @@ include/gtest/gtest-typed-test.h
include/gtest/gtest.h
include/gtest/gtest_pred_impl.h
include/gtest/gtest_prod.h
+include/gtest/internal/custom/README.md
include/gtest/internal/custom/gtest-port.h
include/gtest/internal/custom/gtest-printers.h
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.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-type-util.h
-lib/libgtest.a
+include/gtest/internal/gtest-type-util.h.pump
+lib/cmake/GTest/GTestConfig.cmake
+lib/cmake/GTest/GTestConfigVersion.cmake
+lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/GTest/GTestTargets.cmake
lib/libgtest.so
-lib/libgtest.so.0
-lib/libgtest.so.0.0.0
-lib/libgtest_main.a
lib/libgtest_main.so
-lib/libgtest_main.so.0
-lib/libgtest_main.so.0.0.0
-share/aclocal/gtest.m4
+libdata/pkgconfig/gtest.pc
+libdata/pkgconfig/gtest_main.pc
Modified: head/devel/msgpack/Makefile
==============================================================================
--- head/devel/msgpack/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/devel/msgpack/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -29,6 +29,10 @@ TEST_TARGET= test
USE_GCC= yes
.endif
+post-patch:
+# GoogleTest doesn't support C++98 consumers since 1.10.0
+ @${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/CMakeLists.txt
+
pre-test:
cd ${WRKSRC} && ${CMAKE_BIN} . && ${MAKE_CMD}
Modified: head/finance/gnucash/Makefile
==============================================================================
--- head/finance/gnucash/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/finance/gnucash/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -85,7 +85,7 @@ OFX_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.of
PYTHON_CMAKE_BOOL= WITH_PYTHON
PYTHON_USES= python:3.3+
TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googlemock:build \
- gtest-config:devel/googletest
+ googletest>0:devel/googletest
.include <bsd.port.pre.mk>
Modified: head/lang/cling/Makefile
==============================================================================
--- head/lang/cling/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/lang/cling/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -3,7 +3,7 @@
PORTNAME= cling
DISTVERSION= 0.5-2018-08-13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= lang devel
MASTER_SITES= https://root.cern.ch/download/cling/
DISTNAME= ${PORTNAME}_${DISTVERSION:C/^[0-9]\.[0-9]-//}_sources
Modified: head/math/yacas/Makefile
==============================================================================
--- head/math/yacas/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/math/yacas/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
TEST_DEPENDS= bash:shells/bash \
-BUILD_DEPENDS= gtest-config:devel/googletest
+BUILD_DEPENDS= googletest>0:devel/googletest
CMAKE_ARGS= -DENABLE_DOCS:BOOL=OFF \
-DENABLE_CYACAS_CONSOLE:BOOL=ON \
Modified: head/net-im/mtxclient/Makefile
==============================================================================
--- head/net-im/mtxclient/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/net-im/mtxclient/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \
spdlog>=1.3:devel/spdlog \
- gtest-config:devel/googletest
+ googletest>0:devel/googletest
LIB_DEPENDS= libsodium.so:security/libsodium \
libboost_date_time.so:devel/boost-libs \
libboost_chrono.so:devel/boost-libs \
Modified: head/science/libkml/Makefile
==============================================================================
--- head/science/libkml/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/science/libkml/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -3,7 +3,7 @@
PORTNAME= libkml
PORTVERSION= 1.3.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= science
MAINTAINER= sunpoet at FreeBSD.org
Modified: head/security/certificate-transparency/Makefile
==============================================================================
--- head/security/certificate-transparency/Makefile Sat Oct 5 00:42:03 2019 (r513800)
+++ head/security/certificate-transparency/Makefile Sat Oct 5 00:42:20 2019 (r513801)
@@ -3,7 +3,7 @@
PORTNAME= certificate-transparency
PORTVERSION= 20161015
-PORTREVISION= 38
+PORTREVISION= 39
CATEGORIES= security
MAINTAINER= ports at FreeBSD.org
More information about the svn-ports-head
mailing list