diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-26 08:11:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-26 08:57:09 +0100 |
| commit | 49f81b3f33e1b043a1615855503768d78db5f093 (patch) | |
| tree | 36bb8349c7cee28088c649d5e97878130b4417a1 /external | |
| parent | 1e161eb96e4ed72e43c158253069f974fff5b36f (diff) | |
external/opencollada: Adapt to clang -stdlib=libc++
For one, libc++ has no <tr1/unordered_*> headers, and for another, std::isnan
needs <cmath>.
Change-Id: I39179a9069826cb08bac19c0f6e56acdc1ab6b9d
Diffstat (limited to 'external')
| -rw-r--r-- | external/opencollada/UnpackedTarball_opencollada.mk | 1 | ||||
| -rw-r--r-- | external/opencollada/patches/libc++.patch.0 | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/external/opencollada/UnpackedTarball_opencollada.mk b/external/opencollada/UnpackedTarball_opencollada.mk index a1837927e1dd..f70cc2a609ce 100644 --- a/external/opencollada/UnpackedTarball_opencollada.mk +++ b/external/opencollada/UnpackedTarball_opencollada.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,opencollada,\ external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 \ external/opencollada/patches/opencollada.clang.patch.0 \ external/opencollada/patches/opencollada.libxml.patch.0 \ + external/opencollada/patches/libc++.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/opencollada/patches/libc++.patch.0 b/external/opencollada/patches/libc++.patch.0 new file mode 100644 index 000000000000..bcf5b2cad187 --- /dev/null +++ b/external/opencollada/patches/libc++.patch.0 @@ -0,0 +1,21 @@ +--- COLLADABaseUtils/include/COLLADABUhash_map.h ++++ COLLADABaseUtils/include/COLLADABUhash_map.h +@@ -60,7 +60,7 @@ + #define COLLADABU_HASH_NAMESPACE_CLOSE } + #define COLLADABU_HASH_FUN hash + #endif +-#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION) ++#elif defined(_LIBCPP_VERSION) + #include <unordered_map> + #include <unordered_set> + #define COLLADABU_HASH_MAP std::unordered_map +--- GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp ++++ GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp +@@ -10,6 +10,7 @@ + + #include "GeneratedSaxParserUtils.h" + #include <math.h> ++#include <cmath> + #include <memory> + #include <string.h> + #include <limits> |