diff options
| author | Slávek Banko <[email protected]> | 2023-06-30 02:19:09 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2023-07-05 00:45:29 +0200 |
| commit | 9c4648db2857c300cfd3bd96b8916401587377aa (patch) | |
| tree | e466fa47bf8941675c25c44ee904d10cf2246e9f | |
| parent | 1ceff2dba4252b67523ec18c59f644bddf72627a (diff) | |
| download | tdebase-9c4648db2857c300cfd3bd96b8916401587377aa.tar.gz tdebase-9c4648db2857c300cfd3bd96b8916401587377aa.zip | |
Add detection and, if necessary, prototype for strlcat and strlcpy.
This resolves FTBFS - see issue TDE/tde-packaging-gentoo#299.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit c69b585fbe2bd59567358767e95789ccad43469e)
| -rw-r--r-- | ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | config.h.cmake | 27 |
2 files changed, 36 insertions, 0 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 244a6e48a..455fcab01 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -387,6 +387,15 @@ 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 ) diff --git a/config.h.cmake b/config.h.cmake index fec3909f4..3324456f3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -132,6 +132,33 @@ // kcontrol/input #cmakedefine HAVE_LIBUSB 1 +// ksysguard, kcheckpass +#cmakedefine HAVE_STRLCAT 1 +#cmakedefine HAVE_STRLCAT_PROTO 1 +#cmakedefine HAVE_STRLCPY 1 +#cmakedefine HAVE_STRLCPY_PROTO 1 + +#if !defined(HAVE_STRLCAT_PROTO) +#ifdef __cplusplus +extern "C" { +#endif +unsigned long strlcat(char*, const char*, unsigned long); +#ifdef __cplusplus +} +#endif +#endif + +#if !defined(HAVE_STRLCPY_PROTO) +#ifdef __cplusplus +extern "C" { +#endif +unsigned long strlcpy(char*, const char*, unsigned long); +#ifdef __cplusplus +} +#endif +#endif + + // tdeprint #cmakedefine HAVE_SIGACTION 1 #cmakedefine HAVE_SIGSET 1 |