diff --git a/repos/libports/include/stdcxx/bits/c++config.h b/repos/libports/include/stdcxx/bits/c++config.h index 66a8b82254..9b8c776a2b 100644 --- a/repos/libports/include/stdcxx/bits/c++config.h +++ b/repos/libports/include/stdcxx/bits/c++config.h @@ -1261,7 +1261,7 @@ namespace std /* Define if C99 types in should be imported in in namespace std::tr1. */ -/* #undef GLIBCXX_USE_C99_STDINT_TR1 */ +#define _GLIBCXX_USE_C99_STDINT_TR1 1 /* Defined if clock_gettime has monotonic clock support. */ /* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */ diff --git a/repos/libports/ports/stdcxx.hash b/repos/libports/ports/stdcxx.hash index 7381680696..c221ff97c4 100644 --- a/repos/libports/ports/stdcxx.hash +++ b/repos/libports/ports/stdcxx.hash @@ -1 +1 @@ -b39cfa69b3aa8f3a5f2d27b4249fbf15d402e1e4 +e718998ad84312ca17d023013fc1e1e981c144be diff --git a/repos/libports/ports/stdcxx.port b/repos/libports/ports/stdcxx.port index d77861b444..247170fcad 100644 --- a/repos/libports/ports/stdcxx.port +++ b/repos/libports/ports/stdcxx.port @@ -10,6 +10,9 @@ KEY(gcc) := GNU TAR_OPT(gcc) := gcc-$(VERSION)/libstdc++-v3 --strip-components=2 +PATCHES := src/lib/stdcxx/type_traits.patch +PATCH_OPT := -p1 -d src/lib/stdcxx + DIRS := include/stdcxx DIR_CONTENT(include/stdcxx) := \ src/lib/stdcxx/include/* \ diff --git a/repos/libports/src/lib/stdcxx/type_traits.patch b/repos/libports/src/lib/stdcxx/type_traits.patch new file mode 100644 index 0000000000..f525696a3a --- /dev/null +++ b/repos/libports/src/lib/stdcxx/type_traits.patch @@ -0,0 +1,20 @@ + +--- a/include/std/type_traits ++++ b/include/std/type_traits +@@ -38,15 +38,7 @@ + #include + + #ifdef _GLIBCXX_USE_C99_STDINT_TR1 +-# if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__) +-namespace std +-{ +- typedef __UINT_LEAST16_TYPE__ uint_least16_t; +- typedef __UINT_LEAST32_TYPE__ uint_least32_t; +-} +-# else +-# include +-# endif ++#include + #endif + + namespace std _GLIBCXX_VISIBILITY(default)