author: Petr Salinger Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -218,6 +218,12 @@ namespace QT_NAMESPACE {} # define Q_OS_RELIANT #elif defined(__linux__) || defined(__linux) # define Q_OS_LINUX +# define Q_OS_GLIBC +#elif defined(__GNU_HURD__) || defined(__GNU__) +# define Q_OS_HURD +# define Q_OS_GLIBC +#elif defined(__GLIBC__) +# define Q_OS_GLIBC #elif defined(__FreeBSD__) || defined(__DragonFly__) # define Q_OS_FREEBSD # define Q_OS_BSD4 @@ -238,8 +244,6 @@ namespace QT_NAMESPACE {} # define Q_OS_AIX #elif defined(__Lynx__) # define Q_OS_LYNX -#elif defined(__GNU__) -# define Q_OS_HURD #elif defined(__DGUX__) # define Q_OS_DGUX #elif defined(__QNXNTO__) --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -295,13 +295,13 @@ static bool qt_parse_pattern(const char #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK) -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC) # define USE_MMAP QT_BEGIN_INCLUDE_NAMESPACE # include # include QT_END_INCLUDE_NAMESPACE -#endif // Q_OS_FREEBSD || Q_OS_LINUX +#endif // Q_OS_FREEBSD || Q_OS_GLIBC static long qt_find_pattern(const char *s, ulong s_len, const char *pattern, ulong p_len) --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -77,7 +77,7 @@ QT_END_NAMESPACE #include #include -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) # include #endif @@ -6538,7 +6538,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in _control87(MCW_EM, MCW_EM); #endif -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) fenv_t envp; feholdexcept(&envp); #endif @@ -6554,7 +6554,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in #endif //_M_X64 #endif //Q_OS_WIN -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) fesetenv(&envp); #endif