From 196fabb203d4be929902d1d3a8aa8f80d3f1d3ed Mon Sep 17 00:00:00 2001 From: ormorph Date: Tue, 14 Nov 2023 08:42:36 +0300 Subject: [PATCH] Fix strlcat and strlcpy check Solving the TDE/tde-packaging-gentoo#310 problem. Glibc-2.38 adds new functions strlcat and strlcpy. Signed-off-by: ormorph (cherry picked from commit a99f7a16ff7034f7c7ef77d7702a6f5bee0e2616) --- ConfigureChecks.cmake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 455fcab01..9209fd2fc 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -23,6 +23,11 @@ tde_setup_largefiles( ) find_package( TQt ) find_package( TDE ) +# strlcat and strlcpy check +check_function_exists( strlcat HAVE_STRLCAT ) +check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO ) +check_function_exists( strlcpy HAVE_STRLCPY ) +check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO ) ##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids" @@ -387,15 +392,6 @@ if( BUILD_TDEIOSLAVES OR BUILD_KSYSGUARD ) endif( ) -# strlcat, strlcpy -if( BUILD_KSYSGUARD OR BUILD_KCHECKPASS ) - check_function_exists( strlcat HAVE_STRLCAT ) - check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO ) - check_function_exists( strlcpy HAVE_STRLCPY ) - check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO ) -endif( ) - - # getifaddrs (kcontrol, tdm) if( BUILD_KCONTROL OR BUILD_TDM ) check_function_exists( getifaddrs HAVE_GETIFADDRS )