diff options
| author |   Wolfram Schlich <wschlich@gentoo.org> | 2009-11-21 13:51:48 +0000 |
|---|---|---|
| committer | Wolfram Schlich <wschlich@gentoo.org> | 2009-11-21 13:51:48 +0000 |
| commit | 7cf30bb975888c73fde53343dc9ab6d26e125c35 (patch) | |
| tree | 5ec1253ec4e5b877e3fbebde7f93266249021fb8 /sys-block/megactl | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-7cf30bb975888c73fde53343dc9ab6d26e125c35.tar.gz gentoo-2-7cf30bb975888c73fde53343dc9ab6d26e125c35.tar.bz2 gentoo-2-7cf30bb975888c73fde53343dc9ab6d26e125c35.zip | |
fix bug #218606
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sys-block/megactl')
| -rw-r--r-- | sys-block/megactl/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-block/megactl/files/megactl-0.4.1-Makefile.patch | 26 | ||||
| -rw-r--r-- | sys-block/megactl/megactl-0.4.1-r1.ebuild | 35 |
3 files changed, 69 insertions, 2 deletions
diff --git a/sys-block/megactl/ChangeLog b/sys-block/megactl/ChangeLog index 83dbba751789..9127e0c6914d 100644 --- a/sys-block/megactl/ChangeLog +++ b/sys-block/megactl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-block/megactl -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.3 2008/05/28 21:18:58 maekke Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.4 2009/11/21 13:51:48 wschlich Exp $ + +*megactl-0.4.1-r1 (21 Nov 2009) + + 21 Nov 2009; Wolfram Schlich <wschlich@gentoo.org> + +files/megactl-0.4.1-Makefile.patch, +megactl-0.4.1-r1.ebuild: + fix bug #218606 28 May 2008; Markus Meier <maekke@gentoo.org> megactl-0.4.1.ebuild: add ~amd64, bug #218606 diff --git a/sys-block/megactl/files/megactl-0.4.1-Makefile.patch b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch new file mode 100644 index 000000000000..f1ee2f9bb2a4 --- /dev/null +++ b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch @@ -0,0 +1,26 @@ +diff -urN megactl-0.4.1.orig/src/Makefile megactl-0.4.1/src/Makefile +--- megactl-0.4.1.orig/src/Makefile 2007-08-21 09:19:53.000000000 +0200 ++++ megactl-0.4.1/src/Makefile 2009-11-21 12:30:44.242501898 +0100 +@@ -1,11 +1,17 @@ + +-SRCS= megactl.c adapter.c megaioctl.c megatrace.c callinfo.c dumpbytes.c logpage.c ntrim.c ++SRCS= megactl.c adapter.c megaioctl.c callinfo.c dumpbytes.c logpage.c ntrim.c + INC= -I./schily -Iincludes-hack + HDRS= mega.h adapter.h megaioctl.h callinfo.h logpage.h dumpbytes.h +-ARCH= -m32 +-CFLAGS= -g -Wall $(INC) $(ARCH) +-LDFLAGS= -g $(ARCH) +-PROGRAMS= megactl megasasctl megatrace ++ARCH?= -m32 ++CFLAGS?= -g -Wall ++CFLAGS+= $(INC) $(ARCH) ++LDFLAGS?= -g ++LDFLAGS+= $(ARCH) ++PROGRAMS= megactl megasasctl ++ifeq ($(ARCH),-m32) ++PROGRAMS+= megatrace ++SRCS+= megatrace.c ++endif + + all: $(PROGRAMS) + diff --git a/sys-block/megactl/megactl-0.4.1-r1.ebuild b/sys-block/megactl/megactl-0.4.1-r1.ebuild new file mode 100644 index 000000000000..2d9a3357dff2 --- /dev/null +++ b/sys-block/megactl/megactl-0.4.1-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/megactl-0.4.1-r1.ebuild,v 1.1 2009/11/21 13:51:48 wschlich Exp $ + +EAPI=2 + +inherit eutils + +IUSE="" +DESCRIPTION="LSI MegaRAID control utility" +HOMEPAGE="http://sourceforge.net/projects/megactl/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + epatch "${FILESDIR}"/${P}.patch + epatch "${FILESDIR}"/${P}-Makefile.patch +} + +src_compile() { + cd src + use x86 && MY_MAKEOPTS="ARCH=-m32" + use amd64 && MY_MAKEOPTS="ARCH=-m64" + emake ${MY_MAKEOPTS} || die "make failed" +} + +src_install() { + cd src + dosbin megactl megasasctl + use x86 && dosbin megatrace + use amd64 && ewarn "megatrace was not installed because it does not compile on amd64" + dodoc megarpt megasasrpt ../README +} |