From 0f00acbca40c056dcbba89423ac88dd819d222d9 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 5 Dec 2023 13:47:20 +0300 Subject: Release version 8.0.15+12 Define HAVE_STRLCAT on Linux if GNU libc is 2.38 or newer. Fix link order so that libraries are linked after all object files. Switch to using -pthread instead of -D_REENTRANT/-lpthread in buildfiles and bump build2 version requirement to 0.15.0. Use legal{} target type for legal documentation (LICENSE, etc). --- libmysqlclient/mysql/buildfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libmysqlclient/mysql/buildfile') 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. -- cgit v1.1