Date: Sat, 7 Sep 2013 08:30:30 +0100 From: David Chisnall <theraven@FreeBSD.org> To: Gerald Pfeifer <gerald@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: svn commit: r326441 - head/lang/gcc46/files Message-ID: <E8847CA3-EDEA-43CB-8858-7AD2F2E39AEC@FreeBSD.org> In-Reply-To: <201309052008.r85K8S8j073628@svn.freebsd.org> References: <201309052008.r85K8S8j073628@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In theory, this is no longer needed on head. I fixed our iconv.h = yesterday not to include stdbool.h. =20 David On 5 Sep 2013, at 21:08, Gerald Pfeifer <gerald@FreeBSD.org> wrote: > Author: gerald > Date: Thu Sep 5 20:08:27 2013 > New Revision: 326441 > URL: http://svnweb.freebsd.org/changeset/ports/326441 >=20 > Log: > Work around a bug in libcpp that pulls in the optional system iconv > if present instead of relying on the port we actually depend on. >=20 > The issue is that /usr/include/iconv.h has #include <stdbool.h> which > in turn, since both are included very late in the game, conflicts = with > similar definintions by libcpp itself. >=20 > Interestingly enough, lang/gcc46 and lang/gcc48 did not fail under = the > same test scenarios and libstdc++ does not seem to require = adjustments, > so PR 161417 may not be relevant in full. >=20 > PR: 161417 >=20 > Added: > head/lang/gcc46/files/patch-libcpp (contents, props changed) >=20 > Added: head/lang/gcc46/files/patch-libcpp > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/lang/gcc46/files/patch-libcpp Thu Sep 5 20:08:27 2013 = (r326441) > @@ -0,0 +1,10 @@ > +--- libcpp/internal.h 2012-07-30 09:24:59.000000000 +0000 > ++++ libcpp/internal.h 2013-09-04 00:41:26.000000000 +0000 > +@@ -27,6 +27,7 @@ > + #include "cpp-id-data.h" > +=20 > + #if HAVE_ICONV > ++#define __bool_true_false_are_defined > + #include <iconv.h> > + #else > + #define HAVE_ICONV 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E8847CA3-EDEA-43CB-8858-7AD2F2E39AEC>