external/nss/UnpackedTarball_nss.mk | 1 + external/nss/nss-std-string.patch.1 | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
New commits: commit ab7719c026386a352d1bb62e98cdbb881c46ed4f Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Wed Jun 14 01:00:36 2023 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 01:00:36 2023 +0200 Fix nss build for devtoolset-7 string erase Error was: nss_bogo_shim.cc:43:66: error: no matching function for call to ‘std::basic_string Change-Id: I357d61fcb6299ac87edac2229a1a134199e7d37a diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index e77f92341d91..04d098cadc19 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-win32-make.patch.1 \ external/nss/ubsan.patch.0 \ external/nss/clang-cl.patch.0 \ + external/nss/nss-std-string.patch.1 \ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ $(if $(filter iOS,$(OS)), \ diff --git a/external/nss/nss-std-string.patch.1 b/external/nss/nss-std-string.patch.1 new file mode 100644 index 000000000000..2669cfb51a4a --- /dev/null +++ b/external/nss/nss-std-string.patch.1 @@ -0,0 +1,15 @@ +diff -ur nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc +--- nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13 22:06:35.757518272 +0200 ++++ nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13 22:06:50.521508892 +0200 +@@ -40,8 +40,8 @@ + } + + static void StringRemoveNewlines(std::string& str) { +- str.erase(std::remove(str.begin(), str.end(), '\n'), str.cend()); +- str.erase(std::remove(str.begin(), str.end(), '\r'), str.cend()); ++ str.erase(std::remove(str.begin(), str.end(), '\n'), str.end()); ++ str.erase(std::remove(str.begin(), str.end(), '\r'), str.end()); + } + + class TestAgent { +Only in nss/nss/gtests/nss_bogo_shim: nss_bogo_shim.cc~