From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 41971138824 for ; Wed, 22 Oct 2014 21:03:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E442E0807; Wed, 22 Oct 2014 21:03:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2005E0807 for ; Wed, 22 Oct 2014 21:03:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C830D340545 for ; Wed, 22 Oct 2014 21:03:03 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2304) id 7D75887E4; Wed, 22 Oct 2014 21:03:02 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999-r1.ebuild grub-2.02_beta2-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: grub-9999-r1.ebuild grub-2.02_beta2-r2.ebuild ChangeLog X-VCS-Directories: sys-boot/grub X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20141022210302.7D75887E4@oystercatcher.gentoo.org> Date: Wed, 22 Oct 2014 21:03:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f9128d6-9180-41f5-8e9f-88d69130a5cd X-Archives-Hash: 229eca62f29bed87d3f649dc27dad5e3 floppym 14/10/22 21:03:02 Modified: grub-9999-r1.ebuild grub-2.02_beta2-r2.ebuild ChangeLog Log: Use test-flags-CC instead of gcc-version check, thanks to vapier. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) Revision Changes Path 1.22 sys-boot/grub/grub-9999-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?r1=1.21&r2=1.22 Index: grub-9999-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- grub-9999-r1.ebuild 19 Oct 2014 01:51:58 -0000 1.21 +++ grub-9999-r1.ebuild 22 Oct 2014 21:03:02 -0000 1.22 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.21 2014/10/19 01:51:58 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.22 2014/10/22 21:03:02 floppym Exp $ EAPI=5 @@ -137,7 +137,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bug 439082 - if ! version_is_at_least 4.8 "$(gcc-version)" && + if ! test-flags-CC -fuse-ld=bfd > /dev/null && $(tc-getLD) --version | grep -q "GNU gold"; then eerror "GRUB does not function correctly when built with the gold linker." eerror "Please select the bfd linker with binutils-config." @@ -246,9 +246,7 @@ use static && HOST_LDFLAGS+=" -static" - if version_is_at_least 4.8 "$(gcc-version)"; then - export TARGET_LDFLAGS+=" -fuse-ld=bfd" - fi + export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)" tc-export CC NM OBJCOPY STRIP export TARGET_CC=${TARGET_CC:-${CC}} 1.4 sys-boot/grub/grub-2.02_beta2-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?r1=1.3&r2=1.4 Index: grub-2.02_beta2-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grub-2.02_beta2-r2.ebuild 24 Sep 2014 21:12:02 -0000 1.3 +++ grub-2.02_beta2-r2.ebuild 22 Oct 2014 21:03:02 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v 1.3 2014/09/24 21:12:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v 1.4 2014/10/22 21:03:02 floppym Exp $ EAPI=5 @@ -135,7 +135,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bug 439082 - if ! version_is_at_least 4.8 "$(gcc-version)" && + if ! test-flags-CC -fuse-ld=bfd > /dev/null && $(tc-getLD) --version | grep -q "GNU gold"; then eerror "GRUB does not function correctly when built with the gold linker." eerror "Please select the bfd linker with binutils-config." @@ -249,9 +249,7 @@ use static && HOST_LDFLAGS+=" -static" - if version_is_at_least 4.8 "$(gcc-version)"; then - export TARGET_LDFLAGS+=" -fuse-ld=bfd" - fi + export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)" tc-export CC NM OBJCOPY STRIP export TARGET_CC=${TARGET_CC:-${CC}} 1.325 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.325&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.325&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.324&r2=1.325 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- ChangeLog 22 Oct 2014 16:59:39 -0000 1.324 +++ ChangeLog 22 Oct 2014 21:03:02 -0000 1.325 @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.324 2014/10/22 16:59:39 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.325 2014/10/22 21:03:02 floppym Exp $ + + 22 Oct 2014; Mike Gilbert grub-2.02_beta2-r2.ebuild, + grub-9999-r1.ebuild: + Use test-flags-CC instead of gcc-version check, thanks to vapier. 22 Oct 2014; Ian Stakenvicius (_AxS_) grub-0.97-r14.ebuild: grub:0 - Only apply -fuse-ld=bfd when gcc is new enough to support it, bug