axs 14/10/22 21:28:39 Modified: grub-0.97-r14.ebuild ChangeLog Log: grub:0 - undid the ugly patch-based hacks for forcing ld.bfd, thanks to vapier and floppym (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Revision Changes Path 1.4 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.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?r1=1.3&r2=1.4 Index: grub-0.97-r14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grub-0.97-r14.ebuild 22 Oct 2014 16:59:39 -0000 1.3 +++ grub-0.97-r14.ebuild 22 Oct 2014 21:28:39 -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-0.97-r14.ebuild,v 1.3 2014/10/22 16:59:39 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.4 2014/10/22 21:28:39 axs 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 @@ -47,7 +47,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bugs 526348 , 466536 - 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." @@ -85,17 +85,7 @@ || die EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch - rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away - - # Force ld.bfd via configure.ac so as to not mess up the CFLAGS stuff in src_configure() - # Note: NOT adding this to the patchset because it's a hack that I don't like. - # (bug 466536) - # Conditionally epatch (*yuck*) so gcc-4.7 and earlier don't fail, bug 526348 - if version_is_at_least 4.8 "$(gcc-version)"; then - epatch "${FILESDIR}"/${P}-force-ld.bfd.patch - fi - eautoreconf } @@ -120,6 +110,9 @@ # -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) + export grub_cv_prog_objcopy_absolute=yes #79734 use static && append-ldflags -static 1.326 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.326&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.326&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.325&r2=1.326 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- ChangeLog 22 Oct 2014 21:03:02 -0000 1.325 +++ ChangeLog 22 Oct 2014 21:28:39 -0000 1.326 @@ -1,6 +1,11 @@ # 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.325 2014/10/22 21:03:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.326 2014/10/22 21:28:39 axs Exp $ + + 22 Oct 2014; Ian Stakenvicius (_AxS_) <a...@gentoo.org> + -files/grub-0.97-force-ld.bfd.patch, grub-0.97-r14.ebuild: + grub:0 - undid the ugly patch-based hacks for forcing ld.bfd, thanks to vapier + and floppym 22 Oct 2014; Mike Gilbert <flop...@gentoo.org> grub-2.02_beta2-r2.ebuild, grub-9999-r1.ebuild:
