DilOS tdelibs: Refresh DilOS specific patches.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 119afc3253)
pull/92/head
Slávek Banko 5 years ago
parent 26f6a7cb86
commit 5ade42966b
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -2,7 +2,7 @@ Index: tdelibs/CMakeLists.txt
===================================================================
--- tdelibs.orig/CMakeLists.txt
+++ tdelibs/CMakeLists.txt
@@ -188,7 +188,7 @@ check_include_file( "ctype.h" HAVE_CTYPE
@@ -191,7 +191,7 @@ check_include_file( "ctype.h" HAVE_CTYPE
check_include_file( "dirent.h" HAVE_DIRENT_H )
check_include_file( "dld.h" HAVE_DLD_H )
check_include_file( "dlfcn.h" HAVE_DLFCN_H )
@ -11,7 +11,7 @@ Index: tdelibs/CMakeLists.txt
check_include_file( "float.h" HAVE_FLOAT_H )
check_include_file( "fstab.h" HAVE_FSTAB_H )
check_include_file( "ieeefp.h" HAVE_IEEEFP_H )
@@ -224,7 +224,9 @@ check_include_file( "sys/dir.h" HAVE_SYS
@@ -227,7 +227,9 @@ check_include_file( "sys/dir.h" HAVE_SYS
check_include_file( "sys/filio.h" HAVE_SYS_FILIO_H )
check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H )
check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_H )
@ -21,7 +21,7 @@ Index: tdelibs/CMakeLists.txt
check_include_file( "sys/mount.h" HAVE_SYS_MOUNT_H )
if( NOT HAVE_SYS_MOUNT_H )
find_path( SYS_MOUNT_PATH "sys/mount.h" )
@@ -247,6 +249,13 @@ if( NOT HAVE_SYS_UCRED_H )
@@ -250,6 +252,13 @@ if( NOT HAVE_SYS_UCRED_H )
set( HAVE_SYS_UCRED_H "1" )
endif( )
endif( )
@ -35,7 +35,7 @@ Index: tdelibs/CMakeLists.txt
check_include_file( "sys/xattr.h" HAVE_SYS_XATTR_H )
check_include_file( "termios.h" HAVE_TERMIOS_H )
check_include_file( "termio.h" HAVE_TERMIO_H )
@@ -328,9 +337,11 @@ check_symbol_exists( S_ISSOCK "sys/stat.
@@ -331,9 +340,11 @@ check_symbol_exists( S_ISSOCK "sys/stat.
check_symbol_exists( gethostbyname2 "netdb.h" HAVE_GETHOSTBYNAME2 )
check_symbol_exists( gethostbyname2_r "netdb.h" HAVE_GETHOSTBYNAME2_R )
@ -47,7 +47,7 @@ Index: tdelibs/CMakeLists.txt
check_symbol_exists( backtrace "execinfo.h" HAVE_BACKTRACE )
check_cxx_source_compiles( "#include <cxxabi.h>
int main() { abi::__cxa_demangle(0, 0, 0, 0); return 0; }"
@@ -346,7 +357,7 @@ check_symbol_exists( ffs "string.h
@@ -349,7 +360,7 @@ check_symbol_exists( ffs "string.h
check_symbol_exists( asprintf "stdio.h" HAVE_ASPRINTF_PROTO )
check_symbol_exists( vasprintf "stdio.h" HAVE_VASPRINTF_PROTO )
check_symbol_exists( snprintf "stdio.h" HAVE_SNPRINTF_PROTO )
@ -56,7 +56,7 @@ Index: tdelibs/CMakeLists.txt
check_symbol_exists( strvercmp "string.h" HAVE_STRVERCMP_PROTO )
@@ -374,22 +385,32 @@ if( HAVE_GETMNTINFO )
@@ -377,22 +388,32 @@ if( HAVE_GETMNTINFO )
}"
GETMNTINFO_USES_STATVFS )
endif( HAVE_GETMNTINFO )
@ -89,14 +89,10 @@ Index: tdelibs/CMakeLists.txt
check_function_exists( setfsent HAVE_SETFSENT )
check_function_exists( setgroups HAVE_SETGROUPS )
check_function_exists( setlocale HAVE_SETLOCALE )
@@ -398,10 +419,16 @@ check_function_exists( setpriority HAVE_
check_function_exists( isnan HAVE_FUNC_ISNAN )
check_function_exists( _finite HAVE_FUNC__FINITE )
check_function_exists( finite HAVE_FUNC_FINITE )
-check_function_exists( isinf HAVE_FUNC_ISINF )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m )
+check_symbol_exists( isinf "math.h" HAVE_FUNC_ISINF )
+tde_restore( CMAKE_REQUIRED_LIBRARIES )
@@ -398,9 +419,13 @@ check_function_exists( setpriority HAVE_
check_function_exists( setlocale HAVE_SETLOCALE )
check_function_exists( setmntent HAVE_SETMNTENT )
check_function_exists( setpriority HAVE_SETPRIORITY )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES socket nsl )
check_function_exists( freeaddrinfo HAVE_FREEADDRINFO )
+tde_restore( CMAKE_REQUIRED_LIBRARIES )
@ -107,7 +103,7 @@ Index: tdelibs/CMakeLists.txt
check_function_exists( strfmon HAVE_STRFMON )
check_function_exists( stpcpy HAVE_STPCPY )
check_function_exists( readdir_r HAVE_READDIR_R )
@@ -417,7 +444,9 @@ check_function_exists( _getpty HAVE__GET
@@ -416,7 +419,9 @@ check_function_exists( _getpty HAVE__GET
check_function_exists( __argz_count HAVE___ARGZ_COUNT )
check_function_exists( __argz_next HAVE___ARGZ_NEXT )
check_function_exists( __argz_stringify HAVE___ARGZ_STRINGIFY )

Loading…
Cancel
Save