From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SZhy8-0001kS-0q for garchives@archives.gentoo.org; Wed, 30 May 2012 12:25:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FA5AE050E; Wed, 30 May 2012 12:25:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F3C3BE050E for ; Wed, 30 May 2012 12:25:16 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32B37643ED for ; Wed, 30 May 2012 12:25:16 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id E8BAC2004B; Wed, 30 May 2012 12:25:14 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog freebsd-lib-9.0-r3.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20120530122514.E8BAC2004B@flycatcher.gentoo.org> Date: Wed, 30 May 2012 12:25:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 184f3022-e226-4236-b3df-93892895ad74 X-Archives-Hash: f91f9be0e90a9fcd28dc367d76cf3acf aballier 12/05/30 12:25:14 Modified: ChangeLog freebsd-lib-9.0-r3.ebuild Log: Treat multilib and non multilib builds the same way as multilib.eclass = does the right thing. Go back to -isystem for system includes and force t= o use ours as otherwise we may pick gcc ones and it got that wrong. Bypas= s append-flags and append cflags directly as flag-o-matic eclass maintain= ers think it wise to add broken checks that break with flags with spaces. =20 (Portage version: 2.2.0_alpha108/cvs/Linux x86_64) Revision Changes Path 1.153 sys-freebsd/freebsd-lib/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?rev=3D1.153&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?rev=3D1.153&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?r1=3D1.152&r2=3D1.153 Index: ChangeLog =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 RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- ChangeLog 28 May 2012 03:17:39 -0000 1.152 +++ ChangeLog 30 May 2012 12:25:14 -0000 1.153 @@ -1,6 +1,13 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1= .152 2012/05/28 03:17:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1= .153 2012/05/30 12:25:14 aballier Exp $ + + 30 May 2012; Alexis Ballier freebsd-lib-9.0-r3.e= build: + Treat multilib and non multilib builds the same way as multilib.eclass= does + the right thing. Go back to -isystem for system includes and force to = use + ours as otherwise we may pick gcc ones and it got that wrong. Bypass + append-flags and append cflags directly as flag-o-matic eclass maintai= ners + think it wise to add broken checks that break with flags with spaces. =20 28 May 2012; Alexis Ballier freebsd-lib-9.0-r3.e= build: fix broken logic in is_native_abi, by Naohiro Aota, bug #417863 1.4 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r3.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r3.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r3.ebuild?r1=3D1.3&r2=3D1.4 Index: freebsd-lib-9.0-r3.ebuild =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 RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0= -r3.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- freebsd-lib-9.0-r3.ebuild 28 May 2012 03:17:39 -0000 1.3 +++ freebsd-lib-9.0-r3.ebuild 30 May 2012 12:25:14 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9= .0-r3.ebuild,v 1.3 2012/05/28 03:17:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9= .0-r3.ebuild,v 1.4 2012/05/30 12:25:14 aballier Exp $ =20 EAPI=3D2 =20 @@ -337,11 +337,6 @@ =20 if is_crosscompile ; then do_compile - elif ! use multilib ; then - # Forces to use the local copy of headers with USE=3Dbuild as they mig= ht - # be outdated in the system. Assume they are fine otherwise. - use build && append-flags "-I${WORKDIR}/include_proper" - do_compile else for ABI in $(get_all_abis) ; do # First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts= . @@ -353,17 +348,19 @@ =20 local target=3D"$(tc-arch-kernel ${CHOST})" mymakeopts=3D"${mymakeopts} TARGET=3D${target} MACHINE=3D${target} MA= CHINE_ARCH=3D${target}" + CFLAGADD=3D"" if ! is_native_abi ; then mymakeopts=3D"${mymakeopts} COMPAT_32BIT=3D" einfo "Pre-installing includes in include_proper_${ABI}" mkdir "${WORKDIR}/include_proper_${ABI}" || die CTARGET=3D"${CHOST}" install_includes "/include_proper_${ABI}" - CC=3D"${CC} -I${WORKDIR}/include_proper_${ABI}" + CFLAGADD=3D"-isystem ${WORKDIR}/include_proper_${ABI}" else - use build && append-flags "-I${WORKDIR}/include_proper" ; + use build && CFLAGADD=3D"-isystem ${WORKDIR}/include_proper" || CFLA= GADD=3D"-isystem /usr/include"; fi =20 einfo "Building for ABI ${ABI} and TARGET=3D$(tc-arch-kernel ${CHOST}= )" + CFLAGS=3D"${CFLAGS} ${CFLAGADD}" =20 CTARGET=3D"${CHOST}" do_compile =20