summaryrefslogtreecommitdiff
path: root/libmysqlclient/mysql/buildfile
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2023-12-05 13:47:20 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2023-12-05 13:47:20 +0300
commit0f00acbca40c056dcbba89423ac88dd819d222d9 (patch)
treebc17a4a44aa651d0cb647ecca2f318646fb21e8d /libmysqlclient/mysql/buildfile
parentab06271eef2a9d595481c98cdad7e5219bf76067 (diff)
Release version 8.0.15+12v8.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).
Diffstat (limited to 'libmysqlclient/mysql/buildfile')
-rw-r--r--libmysqlclient/mysql/buildfile11
1 files changed, 6 insertions, 5 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.