summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-14 15:28:49 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-10-14 15:28:49 +0000
commitf44eccd1a7afe580240101aff752f5dd6267906c (patch)
tree8405148fbf16530ab12ab1533b4f3048368cbc2d /sys-apps/mkinitrd
parentLet CFLAGS be respected during src_compile rather than being set in stone. (diff)
downloadhistorical-f44eccd1a7afe580240101aff752f5dd6267906c.tar.gz
historical-f44eccd1a7afe580240101aff752f5dd6267906c.tar.bz2
historical-f44eccd1a7afe580240101aff752f5dd6267906c.zip
Let CFLAGS be respected during src_compile rather than being set in stone.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64
Diffstat (limited to 'sys-apps/mkinitrd')
-rw-r--r--sys-apps/mkinitrd/ChangeLog8
-rw-r--r--sys-apps/mkinitrd/Manifest14
-rw-r--r--sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild17
3 files changed, 26 insertions, 13 deletions
diff --git a/sys-apps/mkinitrd/ChangeLog b/sys-apps/mkinitrd/ChangeLog
index 7f913dc3f7f7..b9bf61e6815e 100644
--- a/sys-apps/mkinitrd/ChangeLog
+++ b/sys-apps/mkinitrd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/mkinitrd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.22 2007/02/22 01:14:38 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.23 2008/10/14 15:28:49 flameeyes Exp $
+
+ 14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
+ mkinitrd-4.2.0.3.ebuild:
+ Let CFLAGS be respected during src_compile rather than being set in stone.
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
index baa97ee5b591..8cbaa8faa795 100644
--- a/sys-apps/mkinitrd/Manifest
+++ b/sys-apps/mkinitrd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX mkinitrd-3.5.7-dietssp.patch 8035 RMD160 9f5771ca418e86e54e9c09abac4dcf6830ddefe5 SHA1 b28d1df724cfa746363d9c5fbbe277c7adf9acfc SHA256 15e8e7935d789cc911516677f1e09b54241f5fc41bd16005aacb642252ae9f20
AUX mkinitrd-lvm_statics.diff 591 RMD160 0c119b1300e2bbb007f91955b7157450616c806a SHA1 6af17a057d768bc9d131cc9d0f24afdc8f025ee8 SHA256 27112716e4d4be34681341c5c1ef72466f236de8b1042685fad6dd33ed365c24
AUX mkinitrd-selinux.diff 1007 RMD160 6bd572981825cb35463f2527c016f2129309100d SHA1 313a9ed2a5cb40ac7359a305e2226f4c3524f951 SHA256 706a83c6148c86b3c02e72a74d9975405efe11bb97189f6eb982a95ea4ec9a6a
@@ -5,6 +8,13 @@ DIST mkinitrd-3.5.7.tar.bz2 53233 RMD160 bbf9e1ffb30946f56c4c5d9e6e453a1e5623a18
DIST mkinitrd-4.2.0.3.tar.bz2 63317 RMD160 4bc253378e44f04dffbf4e68acd62bf43b781867 SHA1 c2ceacb60bbab52fc406a77b2e8c88d119c837ef SHA256 7fe1a9dc461bacc7b968ed23a0314563e3136943d68bbfeb3c5bcde57c9fe563
EBUILD mkinitrd-3.5.7-r2.ebuild 1204 RMD160 762ab031f871c92741766872a4c2beceb7016c71 SHA1 d5f47cf40cb107a84788d097698391da766aff34 SHA256 9e2fa93896e97a68bf4861661abc20c5f9bd4016942cae280ac88d66adbf1901
EBUILD mkinitrd-3.5.7-r3.ebuild 1325 RMD160 9ce1f5d06e46a34a29dabe33c0493c210fc9b45c SHA1 f4c1ee3f3ee2789cb95f67f1cff637122a629963 SHA256 28dd8ade13b295baf2c053073e781744cd85d9a90d3b6bd34870626bdadc5d31
-EBUILD mkinitrd-4.2.0.3.ebuild 1104 RMD160 c67fcf8924216e7721d53e7037f408dd25027678 SHA1 86f9f5399514c0a3a26e45358ee054418ede796f SHA256 c7278e4fab1077b698a57b0450b743267b51185e943403152835d1d773a6cb34
-MISC ChangeLog 2878 RMD160 7ba23a1bd23c480954d3075a659b880230170b47 SHA1 b9efa23911c319a09856535aace64767d7a9daa4 SHA256 117daaf152a6cf5175cd11a4b45c8b08ac72db3fca4039182b24afd60f010f5c
+EBUILD mkinitrd-4.2.0.3.ebuild 1186 RMD160 1482d45691896e183b2afd186ea0419e57bb9561 SHA1 afd7d97a2119e68e7d3ad917002e5c8882b27ae5 SHA256 7b180e0838a61bef63d3cc74b519f2d3194a94fb7c2cc891733b6fb589c1e5b1
+MISC ChangeLog 3040 RMD160 7a3fe8b5d82ec61b8724cc415aa29c7c858b662f SHA1 44b5ce219ccaba4a79a303b1fb52b57b816a4820 SHA256 70985fa705e65c70f48f2e94c0188e1af9f4484cbd98ac87f7c1eee3814b2f00
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj0urcACgkQAiZjviIA2XimoACfZUFi9nVSi3fioqMg33nzfXKx
+1EwAnipxAq3v+kjMYJg0zWjLAtDGHdUG
+=lcet
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild b/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild
index f5044eb96544..83733ad1aa48 100644
--- a/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild,v 1.2 2005/08/29 01:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild,v 1.3 2008/10/14 15:28:49 flameeyes Exp $
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Tools for creating initrd images"
HOMEPAGE="http://www.redhat.com/"
@@ -24,16 +24,15 @@ src_unpack() {
# bug 29694 -- Change vgwrapper to static vgscan and vgchange
epatch "${FILESDIR}"/mkinitrd-lvm_statics.diff
sed -i \
- -e "/^CFLAGS/s: -Werror : ${CFLAGS} :" \
- -e "/^LDFLAGS/s:$: ${LDFLAGS}:" \
+ -e '/^CFLAGS/s: -Werror::' \
+ -e '/^CFLAGS/s: -g::' \
+ -e '/^CFLAGS/s:=:+=:' \
grubby/Makefile nash/Makefile
}
src_compile() {
- cd "${S}"/nash
- emake || die "nash compile failed."
- cd "${S}"/grubby
- emake || die "grubby compile failed."
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" -C nash || die "nash compile failed."
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" -C grubby|| die "grubby compile failed."
}
src_install() {