summaryrefslogtreecommitdiff
path: root/libmariadb
diff options
context:
space:
mode:
Diffstat (limited to 'libmariadb')
-rw-r--r--libmariadb/UnpackedTarball_mariadb.mk4
-rw-r--r--libmariadb/mariadb-static-inline.patch11
2 files changed, 15 insertions, 0 deletions
diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk
index 803bb1c878d8..fa3324e00b39 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -19,10 +19,14 @@ $(eval $(call gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmar
$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
+# libmariadb/mariadb-static-inline.patch upstream at
+# <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of
+# non-static inline local_thr_alarm in libmariadb/net.c":
$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
libmariadb/mariadb-thread.patch \
libmariadb/mariadb-swap.patch \
libmariadb/mariadb-trunk-40.patch \
+ libmariadb/mariadb-static-inline.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-static-inline.patch b/libmariadb/mariadb-static-inline.patch
new file mode 100644
index 000000000000..c82266b99809
--- /dev/null
+++ b/libmariadb/mariadb-static-inline.patch
@@ -0,0 +1,11 @@
+--- mariadb/libmysql/net.c 2013-03-15 21:05:15.551769966 +0100
++++ mariadb/libmysql/net.c 2013-03-15 21:26:13.543332306 +0100
+@@ -75,7 +75,7 @@
+ #define thr_alarm_in_use(A) (*(A))
+ #define thr_end_alarm(A)
+ #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C))
+-inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused)))
++static inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused)))
+ {
+ *A=1;
+ return 0;