diff options
| author | Jesse Towner <jwtowner@users.noreply.github.com> | 2021-03-29 10:12:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:12:06 -0700 |
| commit | 170e44d327489442e3b9671c72f06540db6aff4b (patch) | |
| tree | d57996cd6afd16571981ea6410fbbb8a977d6aac /ports/breakpad/fix-unordered_map.patch | |
| parent | cda58bef39757452778a4c81470623a29905a0cb (diff) | |
| download | vcpkg-170e44d327489442e3b9671c72f06540db6aff4b.tar.gz vcpkg-170e44d327489442e3b9671c72f06540db6aff4b.zip | |
[breakpad] add support for Android triplets (#16401)
* [breakpad] add support for Android triplets
This changes vcpkg's custom CMakeLists.txt file for Breakpad so
that it correctly builds libbreakpad_client for Android. It
follows the same source file layout for Android as seen in the
./android/google_breakpad/Android.mk make file.
* [breakpad] update control file
* [breakpad] update versions
* [breakpad] fix for unordered_map in MSVC++ STL and libstdc++
* [breakpad] update versions
* [breakpad] fix to install libbreakpad on non-Android platforms
* [breakpad] update versions
* [breakpad] Read sources list from Android.mk
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/breakpad/fix-unordered_map.patch')
| -rw-r--r-- | ports/breakpad/fix-unordered_map.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ports/breakpad/fix-unordered_map.patch b/ports/breakpad/fix-unordered_map.patch new file mode 100644 index 000000000..0d131d2b8 --- /dev/null +++ b/ports/breakpad/fix-unordered_map.patch @@ -0,0 +1,14 @@ +diff --git a/src/common/unordered.h b/src/common/unordered.h +index c9cbd58..7743eda 100644 +--- a/src/common/unordered.h ++++ b/src/common/unordered.h +@@ -46,7 +46,8 @@ struct unordered_map : public __gnu_cxx::hash_map<T, U, H> {}; + template <class T, class H = __gnu_cxx::hash<T> > + struct unordered_set : public __gnu_cxx::hash_set<T, H> {}; + +-#elif defined(_LIBCPP_VERSION) // c++11 ++#elif (__cplusplus >= 201103L) || defined(_LIBCPP_VERSION) || \ ++ (defined(_MSC_VER) && (_MSC_VER >= 1800)) // c++11 + #include <unordered_map> + #include <unordered_set> + using std::unordered_map; |