diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-05-02 19:51:39 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-05-02 19:51:39 +0000 |
| commit | 85a40e9aeb3ac65e7772d6f0bb22c02785d9a0aa (patch) | |
| tree | 3a1e5e34191b2c60f494f03cb91888b9bf4532fc /sys-boot | |
| parent | Fix building with gcc-4.3 (diff) | |
| download | gentoo-2-85a40e9aeb3ac65e7772d6f0bb22c02785d9a0aa.tar.gz gentoo-2-85a40e9aeb3ac65e7772d6f0bb22c02785d9a0aa.tar.bz2 gentoo-2-85a40e9aeb3ac65e7772d6f0bb22c02785d9a0aa.zip | |
amd64+static together blow up.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index fbc0d7e1bd05..46a13647332e 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.88 2008/04/07 08:14:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.89 2008/05/02 19:51:39 robbat2 Exp $ + + 02 May 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild: + amd64+static together blow up. 07 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild: Bump of patchset only to fix bug #216307. Revbump will happen when I have diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index f9abc0726c86..22cbfdd8e468 100644 --- a/sys-boot/grub/grub-0.97-r5.ebuild +++ b/sys-boot/grub/grub-0.97-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.8 2008/04/07 08:14:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.9 2008/05/02 19:51:39 robbat2 Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -82,6 +82,12 @@ src_compile() { export grub_cv_prog_objcopy_absolute=yes #79734 use static && append-ldflags -static + # Per bug 216625, the emul packages do not provide .a libs for performing + # suitable static linking + if use amd64 && use static ; then + die "You must use the grub-static package if you want a static Grub on amd64!" + fi + # build the net-bootable grub first, but only if "netboot" is set if use netboot ; then econf \ |