[Libreoffice-commits] core.git: libmariadb/mariadb-static-inline.patch libmariadb/UnpackedTarball_mariadb.mk

[Stephan Bergmann]

 libmariadb/UnpackedTarball_mariadb.mk  |    4 ++++
 libmariadb/mariadb-static-inline.patch |   11 +++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 7cb699394616b9641fb746429401b36f031391e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Mar 16 18:54:25 2013 +0100

    No external definition of non-static inline local_thr_alarm
    
    Change-Id: I0ae90e8a46ea314fa0f8650b61d6ee7410a785ca

diff --git a/libmariadb/UnpackedTarball_mariadb.mk b/libmariadb/UnpackedTarball_mariadb.mk
index 803bb1c..fa3324e 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 0000000..c82266b
--- /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;