diff options
| author | Twice <i@twice.moe> | 2021-01-16 07:20:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 15:20:45 -0800 |
| commit | 6df7d6612bf7c1ee983748dfe53196e8c983ff78 (patch) | |
| tree | 52d968235e7f34405318974c47dff07fc3ead026 | |
| parent | d9351c9c3f1e17593c5fe078218c5d07cf746922 (diff) | |
| download | vcpkg-6df7d6612bf7c1ee983748dfe53196e8c983ff78.tar.gz vcpkg-6df7d6612bf7c1ee983748dfe53196e8c983ff78.zip | |
[gtest] Add a patch to fix build error in GCC 11 (#15661)
* [gtest] Add a patch to fix build error in GCC 11
* [gtest] Bump port version to 3
* [gtest] Update version files
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/g-/gtest.json | 5 | ||||
| -rw-r--r-- | ports/gtest/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gtest/fix-build-failure-in-gcc-11.patch | 22 | ||||
| -rw-r--r-- | ports/gtest/portfile.cmake | 1 |
5 files changed, 30 insertions, 2 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 0f246916c..c4e06c2fe 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2270,7 +2270,7 @@ }, "gtest": { "baseline": "1.10.0", - "port-version": 2 + "port-version": 3 }, "gtk": { "baseline": "3.22.19-4", diff --git a/port_versions/g-/gtest.json b/port_versions/g-/gtest.json index 4497553b1..7cc621d82 100644 --- a/port_versions/g-/gtest.json +++ b/port_versions/g-/gtest.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e94f8c09a8fa6ed7fc618734d412878d83069bfb", + "version-string": "1.10.0", + "port-version": 3 + }, + { "git-tree": "88de073e86bcae80206fca0ff4f4f8e6c165f43a", "version-string": "1.10.0", "port-version": 2 diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 724569341..c483eda23 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,5 +1,5 @@ Source: gtest Version: 1.10.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/google/googletest Description: GoogleTest and GoogleMock testing frameworks. diff --git a/ports/gtest/fix-build-failure-in-gcc-11.patch b/ports/gtest/fix-build-failure-in-gcc-11.patch new file mode 100644 index 000000000..b0369892e --- /dev/null +++ b/ports/gtest/fix-build-failure-in-gcc-11.patch @@ -0,0 +1,22 @@ +diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc +index da09a1cf..43cbd78a 100644 +--- a/googletest/src/gtest-death-test.cc ++++ b/googletest/src/gtest-death-test.cc +@@ -1288,7 +1288,7 @@ static void StackLowerThanAddress(const void* ptr, + // making comparison result unpredictable. + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static void StackLowerThanAddress(const void* ptr, bool* result) { +- int dummy; ++ int dummy = 0; + *result = (&dummy < ptr); + } + +@@ -1296,7 +1296,7 @@ static void StackLowerThanAddress(const void* ptr, bool* result) { + GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ + GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_ + static bool StackGrowsDown() { +- int dummy; ++ int dummy = 0; + bool result; + StackLowerThanAddress(&dummy, &result); + return result; diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 30e9dfb20..4cb45954e 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES 0002-Fix-z7-override.patch fix-main-lib-path.patch + fix-build-failure-in-gcc-11.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) |