diff options
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/mcelog/ChangeLog | 7 | ||||
-rw-r--r-- | app-admin/mcelog/mcelog-0.7.ebuild | 18 | ||||
-rw-r--r-- | app-admin/mcelog/mcelog-0.8_pre1.ebuild | 19 |
3 files changed, 33 insertions, 11 deletions
diff --git a/app-admin/mcelog/ChangeLog b/app-admin/mcelog/ChangeLog index d7d379912088..df0841d9bb65 100644 --- a/app-admin/mcelog/ChangeLog +++ b/app-admin/mcelog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/mcelog # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.18 2008/10/14 00:53:49 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/ChangeLog,v 1.19 2008/11/02 11:03:53 maekke Exp $ + + 02 Nov 2008; Markus Meier <maekke@gentoo.org> mcelog-0.7.ebuild, + mcelog-0.8_pre1.ebuild: + respect CC (bug #243320) (and CFLAGS in 0.8, too), add several die + statements 14 Oct 2008; Jeremy Olexa <darkside@gentoo.org> mcelog-0.7.ebuild: respect CFLAGS, bug #239901 diff --git a/app-admin/mcelog/mcelog-0.7.ebuild b/app-admin/mcelog/mcelog-0.7.ebuild index 48158b18fa33..a0c5c32b0fb3 100644 --- a/app-admin/mcelog/mcelog-0.7.ebuild +++ b/app-admin/mcelog/mcelog-0.7.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-0.7.ebuild,v 1.3 2008/10/14 00:53:49 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-0.7.ebuild,v 1.4 2008/11/02 11:03:53 maekke Exp $ + +inherit toolchain-funcs DESCRIPTION="A tool to log and decode Machine Check Exceptions" HOMEPAGE="ftp://ftp.x86-64.org/pub/linux/tools/mcelog/" @@ -17,18 +19,24 @@ RDEPEND="virtual/cron" src_unpack() { unpack ${A} cd "${S}" - sed -i -e 's:-g:${CFLAGS}:g' Makefile || die "sed makefile failed" + sed -i \ + -e 's:-g:${CFLAGS}:g' \ + -e 's:\tgcc:\t$(CC):g' Makefile || die "sed makefile failed" +} + +src_compile() { + emake CC="$(tc-getCC)" || die } src_install() { - dosbin mcelog + dosbin mcelog || die doman mcelog.8 exeinto /etc/cron.daily - newexe mcelog.cron mcelog + newexe mcelog.cron mcelog || die insinto /etc/logrotate.d/ - newins mcelog.logrotate mcelog + newins mcelog.logrotate mcelog || die dodoc CHANGES README } diff --git a/app-admin/mcelog/mcelog-0.8_pre1.ebuild b/app-admin/mcelog/mcelog-0.8_pre1.ebuild index 291dfc230d2b..1704d05bc8df 100644 --- a/app-admin/mcelog/mcelog-0.8_pre1.ebuild +++ b/app-admin/mcelog/mcelog-0.8_pre1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-0.8_pre1.ebuild,v 1.8 2008/02/22 19:41:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-0.8_pre1.ebuild,v 1.9 2008/11/02 11:03:53 maekke Exp $ -inherit eutils +inherit eutils toolchain-funcs MY_PV="${PV/_pre1/pre}" MY_P="${PN}-${MY_PV}" @@ -26,17 +26,26 @@ S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} epatch "${FILESDIR}"/${P}-timestamp-mcelog.patch + + cd "${S}" + sed -i \ + -e 's:-g:${CFLAGS}:g' \ + -e 's:\tgcc:\t$(CC):g' Makefile || die "sed makefile failed" +} + +src_compile() { + emake CC="$(tc-getCC)" || die } src_install() { - dosbin mcelog dbquery + dosbin mcelog dbquery || die doman mcelog.8 exeinto /etc/cron.daily - newexe mcelog.cron mcelog + newexe mcelog.cron mcelog || die insinto /etc/logrotate.d/ - newins mcelog.logrotate mcelog + newins mcelog.logrotate mcelog || die dodoc CHANGES README TODO *.pdf } |