From owner-svn-ports-head@FreeBSD.ORG  Sat Sep  7 07:30:39 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BF64F650;
 Sat,  7 Sep 2013 07:30:39 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F4C22060;
 Sat,  7 Sep 2013 07:30:38 +0000 (UTC)
Received: from [192.168.0.2]
 (cpc27-cmbg15-2-0-cust235.5-4.cable.virginmedia.com [86.27.188.236])
 (authenticated bits=0)
 by theravensnest.org (8.14.5/8.14.5) with ESMTP id r877UZVE078392
 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO);
 Sat, 7 Sep 2013 07:30:37 GMT (envelope-from theraven@FreeBSD.org)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\))
Subject: Re: svn commit: r326441 - head/lang/gcc46/files
From: David Chisnall <theraven@FreeBSD.org>
In-Reply-To: <201309052008.r85K8S8j073628@svn.freebsd.org>
Date: Sat, 7 Sep 2013 08:30:30 +0100
Content-Transfer-Encoding: quoted-printable
Message-Id: <E8847CA3-EDEA-43CB-8858-7AD2F2E39AEC@FreeBSD.org>
References: <201309052008.r85K8S8j073628@svn.freebsd.org>
To: Gerald Pfeifer <gerald@FreeBSD.org>
X-Mailer: Apple Mail (2.1508)
Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org,
 ports-committers@FreeBSD.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Sep 2013 07:30:39 -0000

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