summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2006-09-29 11:23:04 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2006-09-29 11:23:04 +0000
commit1019f758770bcd17ac4db999b3f7815451873511 (patch)
tree91b4708067aac5e970bd960f6c26fa11a0d44742
parent289a6021a27890a78e80bd8927d2654bbf7bc9be (diff)
cyrus-imapd: fix for gcc4 compilation failure. Closes OE bug #1361 and slugos ticket #21
-rw-r--r--packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch11
-rw-r--r--packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch11
-rw-r--r--packages/cyrus-imapd/cyrus-imapd_2.2.12.bb2
3 files changed, 24 insertions, 0 deletions
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
index 0000000000..821fc9ad7f
--- /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
index 0000000000..d1ab605801
--- /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 e18f21bf6f..1bb806cb22 100644
--- 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 \