diff options
Diffstat (limited to 'libmysqlclient/mysql')
| -rw-r--r-- | libmysqlclient/mysql/buildfile | 11 | ||||
| -rw-r--r-- | libmysqlclient/mysql/my_config.h | 13 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile index db02d19..a21aef2 100644 --- a/libmysqlclient/mysql/buildfile +++ b/libmysqlclient/mysql/buildfile @@ -37,8 +37,7 @@ lib{mysqlclient}: {h c }{* -version -config} \ sql/auth/{ hxx }{* } \ sql/auth/{ cxx}{password sha2_password_common} \ sql-common/{ hxx cxx}{* } \ - libmysql/{ hxx cxx}{* -*test*} \ - $imp_libs + libmysql/{ hxx cxx}{* -*test*} lib{mysqlclient}: mysys/cxx{posix_timers}: include = $linux lib{mysqlclient}: mysys/cxx{kqueue_timers}: include = ($bsd || $macos) @@ -47,6 +46,8 @@ lib{mysqlclient}: mysys/{ cxx}{$mysys_win32} \ vio/{ cxx}{$vio_win32 } \ libmysql/authentication_win/{hxx cxx}{* }: include = $windows +lib{mysqlclient}: $imp_libs + libs{mysqlclient}: def{libmysql_exports}: include = $windows # Makes sense to distribute READMEs for the bundled libraries. Note that their @@ -230,14 +231,14 @@ switch $tclass, $tsys # cc.loptions += -Wl,--no-undefined - cc.libs += -ldl -lpthread -lm -lrt + cc.libs += -ldl -lm -lrt -pthread } case 'bsd' - cc.libs += -lexecinfo -lpthread -lm + cc.libs += -lexecinfo -lm -pthread default - cc.libs += -ldl -lpthread -lm + cc.libs += -ldl -lm -pthread } # Export options. diff --git a/libmysqlclient/mysql/my_config.h b/libmysqlclient/mysql/my_config.h index e13079b..be16fe6 100644 --- a/libmysqlclient/mysql/my_config.h +++ b/libmysqlclient/mysql/my_config.h @@ -117,6 +117,18 @@ #undef HAVE_ULONG /* + * GNU libc added strlcpy() and strlcat() in version 2.38 (in anticipation + * of their addition to POSIX). + */ +#if defined(__FreeBSD__) || \ + defined(__APPLE__) || \ + (defined(__GLIBC__) && \ + defined(__GLIBC_MINOR__) && \ + (__GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 38)) +# define HAVE_STRLCAT 1 +#endif + +/* * Specific for Linux. */ #ifdef __linux__ @@ -181,7 +193,6 @@ # define HAVE_KQUEUE_TIMERS 1 # define HAVE_SOCKADDR_IN_SIN_LEN 1 # define HAVE_SOCKADDR_IN6_SIN6_LEN 1 -# define HAVE_STRLCAT 1 #endif /* |