Skip to contentSkip to conversation

package/dovecot: Fix symbol conflict in static build with MySQL enabled

PATCH New Bernd Kuhls 2 participants 2 messages Nov 21, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/dovecot: Fix symbol conflict in static build with MySQL enabled

Fixes
http://autobuild.buildroot.net/results/9b5/9b536926b3b2bf82c683b48e9697a220f1b4bf33/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/dovecot/0003-fix-static-build.patch |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/dovecot/0003-fix-static-build.patch
package/dovecot/0003-fix-static-build.patch new file +24 -0
new file mode 100644
index 0000000..c5dd9d1
@@ -0,0 +1,24 @@
+Fix symbol conflict in static build with MySQL enabled
+
+Compile error log:
+http://autobuild.buildroot.net/results/9b5/9b536926b3b2bf82c683b48e9697a220f1b4bf33/build-end.log
+
+Patch suggested by Timo Sirainen:
+http://www.dovecot.org/list/dovecot/2014-November/098787.html
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff -uNr dovecot-2.2.15.org/src/lib/strnum.h dovecot-2.2.15/src/lib/strnum.h
+--- dovecot-2.2.15.org/src/lib/strnum.h	2014-07-02 17:21:24.000000000 +0200
++++ dovecot-2.2.15/src/lib/strnum.h	2014-11-21 19:26:42.316225982 +0100
+@@ -1,6 +1,10 @@
+ #ifndef STRNUM_H
+ #define STRNUM_H
+ 
++/* libmysqlclient really should try to keep its internal stuff internal so
++   they won't conflict with the actual programs that are trying to use it. */
++#define str_to_time str_to_time_libmysqlclient_craps_all_over
++
+ /* Return TRUE if all characters in string are numbers.
+    Stop when `end_char' is found from string. */
+ bool str_is_numeric(const char *str, char end_char) ATTR_PURE;
Signature · 1 line
1.7.10.4