Date: Mon, 26 May 2014 17:23:51 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Milan Obuch <freebsd-ports@dino.sk> Cc: freebsd-ports@freebsd.org Subject: Re: mail/courier build failures on newer FreeBSD versions Message-ID: <5C74B300-3D6D-4634-98C3-75B06080B712@FreeBSD.org> In-Reply-To: <20140525213854.0d952d1d@zeta.dino.sk> References: <20140525213854.0d952d1d@zeta.dino.sk>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_20288436-6E3D-4D95-8D31-D011ADB482CB
Content-Type: multipart/mixed;
boundary="Apple-Mail=_547931D0-79FB-45F0-A4E7-CD87CFF0DF62"
--Apple-Mail=_547931D0-79FB-45F0-A4E7-CD87CFF0DF62
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
On 25 May 2014, at 21:38, Milan Obuch <freebsd-ports@dino.sk> wrote:
> pkg-fallout-builder@FreeBSD.org sends me every other day mails about
> failing mail/courier build for both 10.0 and 11.0 FreeBSD versions.
> There is some incompatibility with GCC 4.7, which is used to build
> mail/courier on systems with system compiler switched to clang. It
> works, however, with GCC 4.6, this is tested on both 10.0-STABLE and
> 11.0-CURRENT systems, both i386 and amd64 architectures.
Please try this diff, which makes mail/courier compile with clang. I
also verified that it builds with gcc 4.7 and 4.8.
-Dimitry
--Apple-Mail=_547931D0-79FB-45F0-A4E7-CD87CFF0DF62
Content-Disposition: attachment;
filename=mail__courier-fix-c++-1.diff
Content-Type: application/octet-stream;
name="mail__courier-fix-c++-1.diff"
Content-Transfer-Encoding: 7bit
Index: mail/courier/Makefile
===================================================================
--- mail/courier/Makefile (revision 355279)
+++ mail/courier/Makefile (working copy)
@@ -60,7 +60,6 @@
USE_AUTOTOOLS= libtool aclocal automake
AUTOMAKE_ARGS= --add-missing
USE_BZIP2= yes
-USE_GCC= any
USES= fam gettext gmake perl5 pkgconfig
USE_OPENSSL= yes
USE_SUBMAKE= yes
Index: mail/courier/files/patch-courier__cdmsgq.h
===================================================================
--- mail/courier/files/patch-courier__cdmsgq.h (revision 0)
+++ mail/courier/files/patch-courier__cdmsgq.h (working copy)
@@ -0,0 +1,10 @@
+--- courier/cdmsgq.h.orig 2007-07-30 02:25:58.000000000 +0200
++++ courier/cdmsgq.h 2014-05-26 12:10:52.000000000 +0200
+@@ -19,6 +19,7 @@
+
+ #include <string>
+ #include <vector>
++#include <functional>
+
+ class drvinfo;
+ struct rfc822token;
Index: mail/courier/files/patch-courier__cmlmfetch.C
===================================================================
--- mail/courier/files/patch-courier__cmlmfetch.C (revision 0)
+++ mail/courier/files/patch-courier__cmlmfetch.C (working copy)
@@ -0,0 +1,11 @@
+--- courier/cmlmfetch.C.orig 2009-11-08 19:14:47.000000000 +0100
++++ courier/cmlmfetch.C 2014-05-26 11:54:51.000000000 +0200
+@@ -334,7 +334,7 @@ int doindex(const char *n)
+ ack << std::setiosflags(std::ios::right)
+ << std::setw(10)
+ << msgs[i]
+- << resetiosflags(std::ios::right) << " "
++ << std::resetiosflags(std::ios::right) << " "
+ << std::setw(0) << msginfo[i].msgsubj << std::endl;
+ ack << std::setiosflags(std::ios::right)
+ << std::setw(10)
Index: mail/courier/files/patch-courier__webmlmd.H
===================================================================
--- mail/courier/files/patch-courier__webmlmd.H (revision 0)
+++ mail/courier/files/patch-courier__webmlmd.H (working copy)
@@ -0,0 +1,11 @@
+--- courier/webmlmd.H.orig 2007-12-17 13:09:18.000000000 +0100
++++ courier/webmlmd.H 2014-05-26 12:03:28.000000000 +0200
+@@ -49,7 +49,7 @@ namespace webmlmd {
+ T t;
+
+ t.reserve(s.size() * 6 / 5);
+- class T::iterator b=s.begin(), e=s.end(), p=b;
++ typename T::iterator b=s.begin(), e=s.end(), p=b;
+
+ while (b != e)
+ {
--Apple-Mail=_547931D0-79FB-45F0-A4E7-CD87CFF0DF62
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
--Apple-Mail=_547931D0-79FB-45F0-A4E7-CD87CFF0DF62--
--Apple-Mail=_20288436-6E3D-4D95-8D31-D011ADB482CB
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
iEYEARECAAYFAlODXIsACgkQsF6jCi4glqMPpgCdFS3Ayfx5XqdSuDgVZKb1XKCZ
vUUAoNqL/VbALRPYdNBTCL6WcYTeYLEn
=jmeq
-----END PGP SIGNATURE-----
--Apple-Mail=_20288436-6E3D-4D95-8D31-D011ADB482CB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5C74B300-3D6D-4634-98C3-75B06080B712>