From owner-freebsd-testing@FreeBSD.ORG Sun Feb 16 13:05:42 2014 Return-Path: Delivered-To: freebsd-testing@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC2411E6; Sun, 16 Feb 2014 13:05:42 +0000 (UTC) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 752151B5D; Sun, 16 Feb 2014 13:05:42 +0000 (UTC) Received: from coleburn.home.andric.com (coleburn.home.andric.com [192.168.0.15]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 2BA245C45; Sun, 16 Feb 2014 14:05:40 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_151A528F-60B3-40E0-81CE-70AFA50EE14E"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: Compile error with gcc From: Dimitry Andric In-Reply-To: Date: Sun, 16 Feb 2014 14:05:33 +0100 Message-Id: <849648F5-7834-45DD-8BDF-6385BF4F82DB@FreeBSD.org> References: <695E42A3-2009-4DD7-B10E-BF8465C89D39@gmail.com> To: Julio Merino X-Mailer: Apple Mail (2.1827) Cc: Garrett Cooper , freebsd-testing@FreeBSD.org, David Chisnall X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Feb 2014 13:05:42 -0000 --Apple-Mail=_151A528F-60B3-40E0-81CE-70AFA50EE14E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On 16 Feb 2014, at 13:45, Julio Merino wrote: > On Feb 16, 2014, at 7:11, Dimitry Andric wrote: >>=20 >> I don't think this will always work correctly. If MK_LIBCPLUSPLUS is >> defined in bsd.own.mk, it only means libc++ is being *built*, not = that >> it is being used. >>=20 >> It is probably easier and more fool-proof to check if _LIBCPP_VERSION = is >> defined (which is the case when you use libc++) in bconfig.h, like = so: >>=20 >> Index: contrib/atf/bconfig.h >> =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 >> --- contrib/atf/bconfig.h (revision 261974) >> +++ contrib/atf/bconfig.h (working copy) >> @@ -56,7 +56,9 @@ >> #define HAVE_UNSETENV 1 >>=20 >> /* Define to 1 if vsnprintf is in std */ >> +#ifdef _LIBCPP_VERSION >> #define HAVE_VSNPRINTF_IN_STD 1 >> +#endif >=20 > Let's not do that unless we can change configure.ac to generate these = same contents. >=20 > Maybe we can just revert this to _not_ define HAVE_VSNPRINTF_IN_STD as = it used to be the case before the new import? Things were working just = fine with both libstdc++ and libc++ even if that setting was not = accurate for the latter... Well, contrib/atf/atf-c++/detail/application.cpp has: #if !defined(HAVE_VSNPRINTF_IN_STD) namespace std { using ::vsnprintf; } #endif // !defined(HAVE_VSNPRINTF_IN_STD) so it sort of hacks around it anyway. :-) -Dimitry --Apple-Mail=_151A528F-60B3-40E0-81CE-70AFA50EE14E 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) iEYEARECAAYFAlMAt6EACgkQsF6jCi4glqO9UQCffr080erKWdZGeIkyoR2he62G KSgAnjjnX+otNPHleTZ8ia8YNUd6akUM =4OEg -----END PGP SIGNATURE----- --Apple-Mail=_151A528F-60B3-40E0-81CE-70AFA50EE14E--