vapier 15/03/16 21:39:49
Modified: grub-2.00_p5107-r2.ebuild grub-2.02_beta2-r6.ebuild
grub-0.97-r14.ebuild grub-9999-r1.ebuild
grub-2.02_beta2-r7.ebuild grub-2.02_beta2-r3.ebuild
ChangeLog
Log:
Use new toolchain helpers for selecting the bfd linker #439082 by Ambroz
Bizjak.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.10 sys-boot/grub/grub-2.00_p5107-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild?r1=1.9&r2=1.10
Index: grub-2.00_p5107-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grub-2.00_p5107-r2.ebuild 4 Jan 2015 03:16:03 -0000 1.9
+++ grub-2.00_p5107-r2.ebuild 16 Mar 2015 21:39:48 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v
1.9 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r2.ebuild,v
1.10 2015/03/16 21:39:48 vapier Exp $
EAPI=5
@@ -136,18 +136,6 @@
usr/lib.*/grub/.*/kernel.img
"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug 439082
- if ! version_is_at_least 4.8 "$(gcc-version)" &&
- $(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."
- die "GNU gold detected"
- fi
- fi
-}
-
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
@@ -233,10 +221,7 @@
use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static"
- if version_is_at_least 4.8 "$(gcc-version)"; then
- export TARGET_LDFLAGS+=" -fuse-ld=bfd"
- fi
-
+ tc-ld-disable-gold #439082 #466536 #526348
tc-export CC NM OBJCOPY STRIP
export TARGET_CC=${TARGET_CC:-${CC}}
tc-export BUILD_CC # Bug 485592
1.4 sys-boot/grub/grub-2.02_beta2-r6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild?r1=1.3&r2=1.4
Index: grub-2.02_beta2-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-2.02_beta2-r6.ebuild 4 Jan 2015 03:16:03 -0000 1.3
+++ grub-2.02_beta2-r6.ebuild 16 Mar 2015 21:39:48 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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-r6.ebuild,v
1.3 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v
1.4 2015/03/16 21:39:48 vapier Exp $
EAPI=5
@@ -134,18 +134,6 @@
usr/lib.*/grub/.*/kernel.img
"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug 439082
- 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."
- die "GNU gold detected"
- fi
- fi
-}
-
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
@@ -248,8 +236,7 @@
use static && HOST_LDFLAGS+=" -static"
- export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+ tc-ld-disable-gold #439082 #466536 #526348
tc-export CC NM OBJCOPY STRIP
export TARGET_CC=${TARGET_CC:-${CC}}
tc-export BUILD_CC # Bug 485592
1.7 sys-boot/grub/grub-0.97-r14.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?r1=1.6&r2=1.7
Index: grub-0.97-r14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grub-0.97-r14.ebuild 16 Feb 2015 18:06:05 -0000 1.6
+++ grub-0.97-r14.ebuild 16 Mar 2015 21:39:48 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.6
2015/02/16 18:06:05 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.7
2015/03/16 21:39:48 vapier Exp $
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
# all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -44,18 +44,6 @@
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bugs 526348 , 466536
- 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."
- die "GNU gold detected"
- fi
- fi
-}
-
pkg_setup() {
case $(tc-arch) in
amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
@@ -110,8 +98,7 @@
# -fno-stack-protector detected by configure, removed from netboot's
emake.
use custom-cflags || unset CFLAGS
- # Force ld.bfd if we can set it, bug 466536
- append-ldflags $(test-flags-CC -fuse-ld=bfd)
+ tc-ld-disable-gold #439082 #466536 #526348
export grub_cv_prog_objcopy_absolute=yes #79734
use static && append-ldflags -static
1.30 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.30&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.30&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?r1=1.29&r2=1.30
Index: grub-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- grub-9999-r1.ebuild 7 Feb 2015 20:38:02 -0000 1.29
+++ grub-9999-r1.ebuild 16 Mar 2015 21:39:48 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.29
2015/02/07 20:38:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.30
2015/03/16 21:39:48 vapier Exp $
EAPI=5
@@ -143,18 +143,6 @@
usr/lib.*/grub/.*/kernel.img
"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug 439082
- 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."
- die "GNU gold detected"
- fi
- fi
-}
-
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
@@ -256,8 +244,7 @@
use static && HOST_LDFLAGS+=" -static"
- export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+ tc-ld-disable-gold #439082 #466536 #526348
tc-export CC NM OBJCOPY STRIP
export TARGET_CC=${TARGET_CC:-${CC}}
tc-export BUILD_CC # Bug 485592
1.7 sys-boot/grub/grub-2.02_beta2-r7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?r1=1.6&r2=1.7
Index: grub-2.02_beta2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grub-2.02_beta2-r7.ebuild 7 Feb 2015 20:38:02 -0000 1.6
+++ grub-2.02_beta2-r7.ebuild 16 Mar 2015 21:39:48 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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-r7.ebuild,v
1.6 2015/02/07 20:38:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v
1.7 2015/03/16 21:39:48 vapier Exp $
EAPI=5
@@ -141,18 +141,6 @@
usr/lib.*/grub/.*/kernel.img
"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug 439082
- 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."
- die "GNU gold detected"
- fi
- fi
-}
-
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
@@ -256,8 +244,7 @@
use static && HOST_LDFLAGS+=" -static"
- export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+ tc-ld-disable-gold #439082 #466536 #526348
tc-export CC NM OBJCOPY STRIP
export TARGET_CC=${TARGET_CC:-${CC}}
tc-export BUILD_CC # Bug 485592
1.6 sys-boot/grub/grub-2.02_beta2-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild?r1=1.5&r2=1.6
Index: grub-2.02_beta2-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grub-2.02_beta2-r3.ebuild 4 Jan 2015 03:16:03 -0000 1.5
+++ grub-2.02_beta2-r3.ebuild 16 Mar 2015 21:39:48 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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-r3.ebuild,v
1.5 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r3.ebuild,v
1.6 2015/03/16 21:39:48 vapier Exp $
EAPI=5
@@ -134,18 +134,6 @@
usr/lib.*/grub/.*/kernel.img
"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- # Bug 439082
- 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."
- die "GNU gold detected"
- fi
- fi
-}
-
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
@@ -248,8 +236,7 @@
use static && HOST_LDFLAGS+=" -static"
- export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)"
-
+ tc-ld-disable-gold #439082 #466536 #526348
tc-export CC NM OBJCOPY STRIP
export TARGET_CC=${TARGET_CC:-${CC}}
tc-export BUILD_CC # Bug 485592
1.349 sys-boot/grub/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.349&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.349&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.348&r2=1.349
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- ChangeLog 14 Mar 2015 18:05:51 -0000 1.348
+++ ChangeLog 16 Mar 2015 21:39:48 -0000 1.349
@@ -1,6 +1,12 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.348 2015/03/14
18:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.349 2015/03/16
21:39:48 vapier Exp $
+
+ 16 Mar 2015; Mike Frysinger <[email protected]> grub-0.97-r14.ebuild,
+ grub-2.00_p5107-r2.ebuild, grub-2.02_beta2-r3.ebuild,
+ grub-2.02_beta2-r6.ebuild, grub-2.02_beta2-r7.ebuild, grub-9999-r1.ebuild:
+ Use new toolchain helpers for selecting the bfd linker #439082 by Ambroz
+ Bizjak.
14 Mar 2015; Michał Górny <[email protected]> -grub-0.97-r12.ebuild,
-grub-0.97-r13.ebuild:
