diff options
| -rw-r--r-- | package/dovecot/0002-fix-static-build.patch | 24 | ||||
| -rw-r--r-- | package/dovecot/0003-fix-static-build.patch | 24 | ||||
| -rw-r--r-- | package/dovecot/Config.in | 5 |
3 files changed, 5 insertions, 48 deletions
diff --git a/package/dovecot/0002-fix-static-build.patch b/package/dovecot/0002-fix-static-build.patch deleted file mode 100644 index be646bc6a4..0000000000 --- a/package/dovecot/0002-fix-static-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix static build - -MODULE_SUFFIX is undefined when building statically; don't used it. - -Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- -Patch status: sent upstream -(http://dovecot.org/pipermail/dovecot/2014-November/098694.html) - -diff -Nuar dovecot-2.2.15-orig/src/lib/module-dir.c dovecot-2.2.15/src/lib/module-dir.c ---- dovecot-2.2.15-orig/src/lib/module-dir.c 2014-10-18 00:10:15.000000000 +0300 -+++ dovecot-2.2.15/src/lib/module-dir.c 2014-11-13 19:27:29.417786313 +0200 -@@ -621,7 +621,11 @@ - if (*p == '_') - fname = p + 1; - -+#ifdef MODULE_SUFFIX - p = strstr(fname, MODULE_SUFFIX); -+#else -+ p = NULL; -+#endif - if (p == NULL) - return fname; - diff --git a/package/dovecot/0003-fix-static-build.patch b/package/dovecot/0003-fix-static-build.patch deleted file mode 100644 index c5dd9d1389..0000000000 --- a/package/dovecot/0003-fix-static-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 <bernd.kuhls@t-online.de> - -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; diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 5fd1714cf8..9c242fc044 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" + depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() help Dovecot is an open source IMAP and POP3 email server for Linux/UNIX- @@ -51,3 +52,7 @@ config BR2_PACKAGE_DOVECOT_ZLIB source package/dovecot-pigeonhole/Config.in endif # BR2_PACKAGE_DOVECOT + +comment "dovecot needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS |
