[oe-commits] org.oe.dev cyrus-imapd: fix for gcc4 compilation failure. Closes OE bug #1361 and slugos ticket #21

[nail commit]

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

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a2ec817a8f25ad1adffa3c3df93d4ca4892612be
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a2ec817a8f25ad1adffa3c3df93d4ca4892612be
Files:
1
packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
Diffs:

#
# mt diff -r1ff1e66bd77d67f743cae313b9d8ade62bec0555 -ra2ec817a8f25ad1adffa3c3df93d4ca4892612be
#
# 
# 
# add_file "packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch"
#  content [ace24910475b78699de1b3e004564338b14ccd08]
# 
# add_file "packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch"
#  content [327b243de47a6a9e7094b03a1a537400563f2bf9]
# 
# patch "packages/cyrus-imapd/cyrus-imapd_2.2.12.bb"
#  from [62a33ef2259924c2ace256a5c3fe47e57eb1ce9e]
#    to [6da198b3795da23778ff0f2fbef5f2505ca6a4ab]
# 
============================================================
--- packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch	ace24910475b78699de1b3e004564338b14ccd08
+++ packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch	ace24910475b78699de1b3e004564338b14ccd08
@@ -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 =
+ 
+ {
+ 
============================================================
--- packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch	327b243de47a6a9e7094b03a1a537400563f2bf9
+++ packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch	327b243de47a6a9e7094b03a1a537400563f2bf9
@@ -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;
+ 
+ 
+ 
============================================================
--- packages/cyrus-imapd/cyrus-imapd_2.2.12.bb	62a33ef2259924c2ace256a5c3fe47e57eb1ce9e
+++ packages/cyrus-imapd/cyrus-imapd_2.2.12.bb	6da198b3795da23778ff0f2fbef5f2505ca6a4ab
@@ -7,6 +7,8 @@ SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/
 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 \