diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-03-28 22:19:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-28 22:19:17 +0000 |
| commit | b83eb84a5874d4c6f34825471c6efc96580516b1 (patch) | |
| tree | 489789f8152fe199f4439b8c3cfc7936d1252df1 /sys-boot | |
| parent | Raise curl dependency, closes bug #215194 (diff) | |
| download | gentoo-2-b83eb84a5874d4c6f34825471c6efc96580516b1.tar.gz gentoo-2-b83eb84a5874d4c6f34825471c6efc96580516b1.tar.bz2 gentoo-2-b83eb84a5874d4c6f34825471c6efc96580516b1.zip | |
Make ncurses optional.
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index cb4f7e917910..e1ec939db996 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.82 2008/03/25 06:23:40 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.83 2008/03/28 22:19:17 vapier Exp $ + + 28 Mar 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild: + Make ncurses optional. *grub-0.97-r5 (25 Mar 2008) diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index c61370b2b8a9..2752daf52c5d 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.1 2008/03/25 06:23:40 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.2 2008/03/28 22:19:17 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -15,9 +15,9 @@ SRC_URI="mirror://gentoo/${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-fbsd" -IUSE="static netboot custom-cflags" +IUSE="custom-cflags ncurses netboot static" -DEPEND=">=sys-libs/ncurses-5.2-r5" +DEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r5 )" PROVIDE="virtual/bootloader" src_unpack() { @@ -85,7 +85,13 @@ src_compile() { --libdir=/lib \ --datadir=/usr/lib/grub \ --exec-prefix=/ \ - --disable-auto-linux-mem-opt || die "econf failed" + --disable-auto-linux-mem-opt \ + $(use_with ncurses curses) \ + || die "econf failed" + + # sanity check due to common failure + use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found" + emake || die "making regular stuff" } @@ -96,7 +102,7 @@ src_test() { } src_install() { - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die if use netboot ; then exeinto /usr/lib/grub/${CHOST} doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install" |