diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-06-12 12:50:07 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-12 12:50:07 +0200 |
| commit | 1aa221a2bc0a5c2f13a8d95af76a755b3c731251 (patch) | |
| tree | a7a3b607c4f4b90de4c3f802c748a9fad2364632 /src | |
| parent | 0e749567664176465c05497d2145a24c42f76829 (diff) | |
| download | tqt3-1aa221a2bc0a5c2f13a8d95af76a755b3c731251.tar.gz tqt3-1aa221a2bc0a5c2f13a8d95af76a755b3c731251.zip | |
Change tests for glibc version.
It resolves building with libc libraries
other than glibc - for example musl libc.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/3rdparty/libmng/config.guess | 10 | ||||
| -rw-r--r-- | src/tools/qdir_unix.cpp | 8 | ||||
| -rw-r--r-- | src/tools/qfileinfo_unix.cpp | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess index dff9e481b..c604127a2 100755 --- a/src/3rdparty/libmng/config.guess +++ b/src/3rdparty/libmng/config.guess @@ -861,15 +861,7 @@ EOF int main (argc, argv) int argc; char *argv[]; { #endif #ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif + printf ("%s-pc-linux-gnu\n", argv[1]); #else printf ("%s-pc-linux-gnuaout\n", argv[1]); #endif diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 87976bddd..7e23fca7b 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -74,7 +74,7 @@ TQString TQDir::homeDirPath() TQString TQDir::canonicalPath() const { TQString r; -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) char *cur = ::get_current_dir_name(); if ( cur ) { char *tmp = canonicalize_file_name( TQFile::encodeName( dPath ).data() ); @@ -103,7 +103,7 @@ TQString TQDir::canonicalPath() const // FIXME } } -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ return r; } @@ -165,7 +165,7 @@ TQString TQDir::currentDirPath() struct stat st; if ( ::stat( ".", &st ) == 0 ) { -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) char *currentName = ::get_current_dir_name(); if ( currentName ) { result = TQFile::decodeName(currentName); @@ -175,7 +175,7 @@ TQString TQDir::currentDirPath() char currentName[PATH_MAX+1]; if ( ::getcwd( currentName, PATH_MAX ) ) result = TQFile::decodeName(currentName); -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ #if defined(QT_DEBUG) if ( result.isNull() ) tqWarning( "TQDir::currentDirPath: getcwd() failed" ); diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp index 0bf143845..aed39e468 100644 --- a/src/tools/qfileinfo_unix.cpp +++ b/src/tools/qfileinfo_unix.cpp @@ -133,7 +133,7 @@ TQString TQFileInfo::readLink() const if ( !isSymLink() ) return TQString(); #if defined(Q_OS_UNIX) && !defined(Q_OS_OS2EMX) -#if defined(__GLIBC__) && !defined(PATH_MAX) +#if !defined(PATH_MAX) int size = 256; char *s = NULL, *s2; @@ -165,7 +165,7 @@ TQString TQFileInfo::readLink() const s[len] = '\0'; return TQFile::decodeName(s); } -#endif /* __GLIBC__ && !PATH_MAX */ +#endif /* !PATH_MAX */ #endif /* Q_OS_UNIX && !Q_OS_OS2EMX */ #if !defined(TQWS) && defined(Q_OS_MAC) { |