svn commit: r326441 - head/lang/gcc46/files

[David Chisnall]

In theory, this is no longer needed on head.  I fixed our iconv.h yesterday not to include stdbool.h.  

David

On 5 Sep 2013, at 21:08, Gerald Pfeifer <gerald at FreeBSD.org> wrote:

> Author: gerald
> Date: Thu Sep  5 20:08:27 2013
> New Revision: 326441
> URL: http://svnweb.freebsd.org/changeset/ports/326441
> 
> 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.
> 
>  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.
> 
>  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.
> 
>  PR:		161417
> 
> Added:
>  head/lang/gcc46/files/patch-libcpp   (contents, props changed)
> 
> Added: head/lang/gcc46/files/patch-libcpp
> ==============================================================================
> --- /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"
> + 
> + #if HAVE_ICONV
> ++#define __bool_true_false_are_defined
> + #include <iconv.h>
> + #else
> + #define HAVE_ICONV 0