cyrus-imapd: fix for gcc4 compilation failure. Closes OE bug #1361 and slugos ticket #21

diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
new file mode 100644 (file)
index 0000000..821fc9a
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.c.orig     2006-08-10 14:43:19.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.c  2006-08-10 14:43:48.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-struct imapopt_s imapopts[] =
++struct imapopt_s * imapopts =
+ 
+ {
+ 

diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
new file mode 100644 (file)
index 0000000..d1ab605
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.h.orig     2006-08-10 14:43:26.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.h  2006-08-10 14:44:58.000000000 +0200
+@@ -178,7 +178,7 @@
+ 
+ };
+ 
+-extern struct imapopt_s imapopts[];
++extern struct imapopt_s * imapopts;
+ 
+ 
+ 

diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index e18f21b..1bb806c 100644 (file)
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -7,6 +7,8 @@ DEPENDS += "install-native"
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
            file://tail.patch;patch=1 \
+           file://imapopts.c.gcc4.patch;patch=1 \
+           file://imapopts.h.gcc4.patch;patch=1 \
           file://cyrus \
           file://cyrus.conf_2.2 \
           file://imapd.conf_2.2 \