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 | 03101b4a7a236659e79120b83ee2fd62a668fce6 (patch) | |
| tree | cbccc2dcb56592b5a29ee20e9a8862aa50041ac4 /sys-boot/grub | |
| parent | Fix building with gcc-4.3 (diff) | |
| download | historical-03101b4a7a236659e79120b83ee2fd62a668fce6.tar.gz historical-03101b4a7a236659e79120b83ee2fd62a668fce6.tar.bz2 historical-03101b4a7a236659e79120b83ee2fd62a668fce6.zip | |
amd64+static together blow up.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 8 |
3 files changed, 13 insertions, 4 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/Manifest b/sys-boot/grub/Manifest index 5eda1baf2aa8..fbce37d2934e 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -23,8 +23,8 @@ EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e -EBUILD grub-0.97-r5.ebuild 6216 RMD160 e32836252f6412d69976d57af1fb201e8abf74ea SHA1 b0875570af2b6be5a5c0ff40b50052ba4818bb14 SHA256 9fbeb9e5309fb70d030cd45a26772142384f83467dda24fc0d7c22429c746e2f +EBUILD grub-0.97-r5.ebuild 6439 RMD160 111d381fda9c671995cc37a99e579ce9d11edd3d SHA1 af9427cf5a8e76a40c67ac1ce939e5cfa4e63097 SHA256 4937ee3d13df6ea7e028c4066a852f4be654d9ee69d0e087dcf804a5558fd4a1 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.96.ebuild 956 RMD160 f462517b57bda30e9e4b64c43e691099d0beeb9a SHA1 55629e1cf96e29ff702c36d579c08c7487708698 SHA256 8bb370a35d006fa89133863c0393b6356be8e8f66ad3f34f63750624d9b46cb4 -MISC ChangeLog 21214 RMD160 c2c890da5fd715ed7291d6fd345474aa355a935e SHA1 baa4c04623ebeb3bd8ba846a313a4fe2962e55a8 SHA256 57ccaa96108f99dfe829c2758716a40d69339623ade6d0d796e5b81342237e2a +MISC ChangeLog 21322 RMD160 a33704e50807d731a4203b3d05e5de9c0955b523 SHA1 7df25b00409be343adbc9be2e34ee2d718023eee SHA256 b1deae62effc6850f95fbb0aececc1d64fed9098171dbc494af0cc9670a31163 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 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 \ |