From c4b2943a24f0d9054f19ac08440dfe1636e3cdc9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 18 Oct 2021 16:34:04 +0200 Subject: [PATCH] gtest: bump version --- ...test-1.10.0.recipe => gtest-1.11.0.recipe} | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) rename dev-libs/gtest/{gtest-1.10.0.recipe => gtest-1.11.0.recipe} (72%) diff --git a/dev-libs/gtest/gtest-1.10.0.recipe b/dev-libs/gtest/gtest-1.11.0.recipe similarity index 72% rename from dev-libs/gtest/gtest-1.10.0.recipe rename to dev-libs/gtest/gtest-1.11.0.recipe index 76f7c8f57..44bd5fbf7 100644 --- a/dev-libs/gtest/gtest-1.10.0.recipe +++ b/dev-libs/gtest/gtest-1.11.0.recipe @@ -14,9 +14,9 @@ Features: HOMEPAGE="https://github.com/google/googletest" COPYRIGHT="2008-2019 Google Test developers" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/google/googletest/archive/release-$portVersion.tar.gz" -CHECKSUM_SHA256="9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb" +CHECKSUM_SHA256="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5" SOURCE_FILENAME="googletest-release-$portVersion.tar.gz" SOURCE_DIR="googletest-release-$portVersion" @@ -58,10 +58,10 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage gtest$secondaryArchSuffix \ - $libDir/libgmock.so \ - $libDir/libgmock_main.so \ - $libDir/libgtest.so \ - $libDir/libgtest_main.so + $libDir/libgmock.so.1.11.0 \ + $libDir/libgmock_main.so.1.11.0 \ + $libDir/libgtest.so.1.11.0 \ + $libDir/libgtest_main.so.1.11.0 BUILD() { @@ -69,7 +69,8 @@ BUILD() cmake .. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE='Release' \ - -DBUILD_SHARED_LIBS:BOOL=ON + -DBUILD_SHARED_LIBS:BOOL=ON \ + -Dgtest_build_tests=ON make $jobArgs } @@ -78,7 +79,14 @@ INSTALL() cd build make install - sed -i -e "s|prefix=.*|prefix=$prefix|" $libDir/pkgconfig/*.pc + echo -e "prefix=$prefix\n$(cat $libDir/pkgconfig/gtest.pc)" \ + > $libDir/pkgconfig/gtest.pc + echo -e "prefix=$prefix\n$(cat $libDir/pkgconfig/gtest_main.pc)" \ + > $libDir/pkgconfig/gtest_main.pc + echo -e "prefix=$prefix\n$(cat $libDir/pkgconfig/gmock.pc)" \ + > $libDir/pkgconfig/gmock.pc + echo -e "prefix=$prefix\n$(cat $libDir/pkgconfig/gmock_main.pc)" \ + > $libDir/pkgconfig/gmock_main.pc prepareInstalledDevelLibs libgmock libgmock_main libgtest libgtest_main fixPkgconfig @@ -90,9 +98,5 @@ INSTALL() TEST() { -# test needs to be enabled in (BUILD) -# -Dgtest_build_tests=ON (1 tests failed out of 43, but crashes during tests) -# -Dgmock_build_tests=ON (fails during BUILD) - cd build - make test + make -C build test }