diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-12-09 23:07:15 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-12-09 23:07:15 +0000 |
| commit | 6851c4687a35e9404549d893d25ee074a3e13631 (patch) | |
| tree | c4b33359beff0775d351c2d0ccdf2e60fd92f9e8 /sys-boot | |
| parent | Version bump, security bug #489570. (diff) | |
| download | historical-6851c4687a35e9404549d893d25ee074a3e13631.tar.gz historical-6851c4687a35e9404549d893d25ee074a3e13631.tar.bz2 historical-6851c4687a35e9404549d893d25ee074a3e13631.zip | |
Adjust *FLAGS logic and drop custom-cflags use flag.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999-r1.ebuild | 14 |
3 files changed, 19 insertions, 10 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index f3299060b15a..e91d5eb10ca7 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.294 2013/12/09 22:10:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.295 2013/12/09 23:07:13 floppym Exp $ + + 09 Dec 2013; Mike Gilbert <floppym@gentoo.org> grub-9999-r1.ebuild: + Adjust *FLAGS logic and drop custom-cflags use flag. 09 Dec 2013; Mike Gilbert <floppym@gentoo.org> grub-9999-r1.ebuild: Re-enable python3. diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 61d96200848a..45258e55b8f8 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -68,13 +68,13 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253 EBUILD grub-2.00_p5107-r2.ebuild 8031 SHA256 61d9f753e1517eb71b586718f926e2476a333bdb932ed3e98e79152968451408 SHA512 b5342feaf1e08b12f402158a3e9440c05d0b9b61b3732faad4fe4dd24b3288e54b46ac1e6aadab4aaa374e13f0bc3d3065a41c7f56e52c8aa28da0effca0d9e4 WHIRLPOOL ebe46428076776d7a91233a121cbcbdad98c1f9b0b8954d30b5e6f8b68e8b47e5bbfd9ba827b55b02727fe6057946decb6b48c4cb5266800769a23fa65bd85ac EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593 -EBUILD grub-9999-r1.ebuild 8062 SHA256 a2e5c18cadf64a2fb06540c5710279f576d002290414fcb48bfe2ae311300192 SHA512 b9580d8fea7615bf2ec86ad8a2909c2be2d04cfe351c0f7d28df6da1f7c4a21f28ad42c4d44d13c16c1eba597f454085210f04e8450117c4972d3b235df84244 WHIRLPOOL 2f6c91db56e5f3be9848febc750da924f12d23418f909609260861abfc9a243a0f3084aef535c9cb4b69fac7f2549cdfcfba0faf776a139d47e477414bdb1229 -MISC ChangeLog 55140 SHA256 b49255cf66cc5e07fc4868207637dc70636d2a724be4123da922b76b5f8b00f3 SHA512 58d5236f983e5df7a3732192bac2767cd19fbf90bf108bce5247c679ed5c933e34e82c8ba8cb6b3de6839f8b078113ab952c65a5f440e0e608fe5688dbe1eb32 WHIRLPOOL a48a49175dfd548d135a75a13c518ac8f56eb9d08f5df6722c9eab59bcdddafcc96b22b07b600290c0f503230e43bf66f2eee4acf207d3330f9cc37900e6bd2d +EBUILD grub-9999-r1.ebuild 8186 SHA256 2f157600d56098e6fdd36141bda8850c56722da73d8966822398371bbe1daeca SHA512 946f35d6dfed924ad6570d884c8965f69851f73fb8cc155a35b5353296f22b7de86c11c92fd94751f1d52349c93533889d2afaaaf1778bcac687555d0192ede4 WHIRLPOOL 8d55a2ce22831cbaadfd8912434c86d51644b76b2bbaa39f7623f3ce8149df400cf654ef2d1eb26f7789f427c85de57176b8c877b1a413129920104f66fa09ab +MISC ChangeLog 55266 SHA256 8d9a570290be892227ebedaf42930a730a2740b8e8a4590da7e6ee1a5a8121c3 SHA512 07066883f47f8c47af56207a84004160c58b5cb5f0a30aa287b67d03c991e90fd0d402ffb875dd13c9bdbfee9f8ec32b7fc53691b818bfcde5df4ed285474f71 WHIRLPOOL 6bf31fb9b5c006b515c3d6dc9b12fa282fbd4da5ee005c5ce1447566d4042910b188396f6b8581fab7ad63e6437d1ca2bf79c7dfd53d355c16ef24c5a950cca8 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlKmP9oACgkQC77qH+pIQ6TjuwD/U4HiRq/joabR9CBc8/ZxjTac -j04aSFVsxvgwKC3OolkA/0ZAQfF5nY1C9pT3OnYMegDgkim3RxyubpJv/Y8Apa+0 -=XDu+ +iF4EAREIAAYFAlKmTSIACgkQC77qH+pIQ6TqZAEAlTPp3890XC6SUCSdO42Cb76Z +oB6gaBPQx6QsFKY+N5sBALFyi8Fu/+nIWjXTuWEf97BNfy8PGh/2bIvCow3o22he +=8HNT -----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index ccd6454cf950..9f15b60855c6 100644 --- a/sys-boot/grub/grub-9999-r1.ebuild +++ b/sys-boot/grub/grub-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.5 2013/12/09 22:10:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.6 2013/12/09 23:07:13 floppym Exp $ EAPI=5 @@ -48,7 +48,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" SLOT="2" -IUSE="custom-cflags debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" +IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" GRUB_ALL_PLATFORMS=( # everywhere: @@ -228,8 +228,14 @@ grub_configure() { } src_configure() { - use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static" + # We don't want to leak flags onto boot code. + export HOST_CCASFLAGS=${CCASFLAGS} + export HOST_CFLAGS=${CFLAGS} + export HOST_CPPFLAGS=${CPPFLAGS} + export HOST_LDFLAGS=${LDFLAGS} + unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS + + use static && HOST_LDFLAGS+=" -static" if version_is_at_least 4.8 "$(gcc-version)"; then export TARGET_LDFLAGS+=" -fuse-ld=bfd" |