Branch: master

1aa221a2 2019-06-12 10:50:07 Slávek Banko 
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@...>
M mkspecs/linux-clang/qplatformdefs.h
M mkspecs/linux-cxx/qplatformdefs.h
M mkspecs/linux-ecc-64/qplatformdefs.h
M mkspecs/linux-g++-32/qplatformdefs.h
M mkspecs/linux-g++-64/qplatformdefs.h
M mkspecs/linux-g++-sparc/qplatformdefs.h
M mkspecs/linux-g++/qplatformdefs.h
M mkspecs/linux-icc/qplatformdefs.h
M mkspecs/linux-kcc/qplatformdefs.h
M mkspecs/linux-kylix/qplatformdefs.h
M mkspecs/linux-pgcc/qplatformdefs.h
M mkspecs/lynxos-g++/qplatformdefs.h
M src/3rdparty/libmng/config.guess
M src/tools/qdir_unix.cpp
M src/tools/qfileinfo_unix.cpp

mkspecs/linux-clang/qplatformdefs.h

diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
index 01e1544..fd10048 100644
--- a/mkspecs/linux-clang/qplatformdefs.h
+++ b/mkspecs/linux-clang/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-cxx/qplatformdefs.h

diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-cxx/qplatformdefs.h
+++ b/mkspecs/linux-cxx/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-ecc-64/qplatformdefs.h

diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-ecc-64/qplatformdefs.h
+++ b/mkspecs/linux-ecc-64/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-32/qplatformdefs.h

diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h
index eb16077..e6dc1fc 100644
--- a/mkspecs/linux-g++-32/qplatformdefs.h
+++ b/mkspecs/linux-g++-32/qplatformdefs.h
@@ -70,11 +70,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-64/qplatformdefs.h

diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-g++-64/qplatformdefs.h
+++ b/mkspecs/linux-g++-64/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-sparc/qplatformdefs.h

diff --git a/mkspecs/linux-g++-sparc/qplatformdefs.h b/mkspecs/linux-g++-sparc/qplatformdefs.h
index 01e1544..fd10048 100644
--- a/mkspecs/linux-g++-sparc/qplatformdefs.h
+++ b/mkspecs/linux-g++-sparc/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++/qplatformdefs.h

diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index 01e1544..fd10048 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-icc/qplatformdefs.h

diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-icc/qplatformdefs.h
+++ b/mkspecs/linux-icc/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-kcc/qplatformdefs.h

diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
index bbfdfb3..55b623a 100644
--- a/mkspecs/linux-kcc/qplatformdefs.h
+++ b/mkspecs/linux-kcc/qplatformdefs.h
@@ -80,11 +80,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-kylix/qplatformdefs.h

diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-kylix/qplatformdefs.h
+++ b/mkspecs/linux-kylix/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-pgcc/qplatformdefs.h

diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
index 3ac682c..951a476 100644
--- a/mkspecs/linux-pgcc/qplatformdefs.h
+++ b/mkspecs/linux-pgcc/qplatformdefs.h
@@ -77,11 +77,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/lynxos-g++/qplatformdefs.h

diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h
index 882fc38..309bf4e 100644
--- a/mkspecs/lynxos-g++/qplatformdefs.h
+++ b/mkspecs/lynxos-g++/qplatformdefs.h
@@ -76,11 +76,7 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
-#else
-#define QT_SOCKLEN_T		int
-#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

src/3rdparty/libmng/config.guess

diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess
index dff9e48..c604127 100755
--- a/src/3rdparty/libmng/config.guess
+++ b/src/3rdparty/libmng/config.guess
@@ -861,15 +861,7 @@
 	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

src/tools/qdir_unix.cpp

diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 87976bd..7e23fca 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -74,7 +74,7 @@
 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 @@
 		// FIXME
 	}
     }
-#endif  /* __GLIBC__ && !PATH_MAX */
+#endif  /* !PATH_MAX */
     return r;
 }
 
@@ -165,7 +165,7 @@
 
     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 @@
 	char currentName[PATH_MAX+1];
 	if ( ::getcwd( currentName, PATH_MAX ) )
 	    result = TQFile::decodeName(currentName);
-#endif /* __GLIBC__ && !PATH_MAX */
+#endif /* !PATH_MAX */
** Diff limit reached (max: 250 lines) **