diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2009-10-21 22:20:36 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2009-10-21 22:20:36 +0000 |
| commit | 1daea1f28966e58593afb4a225e529516d97ae77 (patch) | |
| tree | 3e94a1a94d48629735d3de2804a654d234f87e45 /eclass | |
| parent | Add new snapshot to work with new x264 snapshot (bug 287850), add subversion ... (diff) | |
| download | gentoo-2-1daea1f28966e58593afb4a225e529516d97ae77.tar.gz gentoo-2-1daea1f28966e58593afb4a225e529516d97ae77.tar.bz2 gentoo-2-1daea1f28966e58593afb4a225e529516d97ae77.zip | |
Took Darkside's advice on preventing a double run of econf for EAPI=2, plus
scarabeus' tip on not accepting unknown EAPIs.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vim.eclass | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/eclass/vim.eclass b/eclass/vim.eclass index 130206f3a648..22183295c283 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.179 2009/10/17 18:30:40 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.180 2009/10/21 22:20:36 lack Exp $ # Authors: # Jim Ramsay <i.am@gentoo.org> @@ -30,11 +30,15 @@ LICENSE="vim" # Check for EAPI functions we need: case "${EAPI:-0}" in + 0|1) + ;; 2) HAS_SRC_PREPARE=1 HAS_USE_DEP=1 ;; - *) ;; + *) + die "Unknown EAPI ${EAPI}" + ;; esac if [[ ${PN##*-} == "cvs" ]] ; then @@ -48,7 +52,7 @@ IUSE="nls acl" TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm" if [[ $HAS_SRC_PREPARE ]]; then - TO_EXPORT="${TO_EXPORT} src_prepare" + TO_EXPORT="${TO_EXPORT} src_prepare src_configure" else TO_EXPORT="${TO_EXPORT} src_unpack" fi @@ -344,7 +348,7 @@ vim_src_unpack() { vim_src_prepare } -vim_src_compile() { +vim_src_configure() { local myconf # Fix bug 37354: Disallow -funroll-all-loops on amd64 @@ -467,6 +471,10 @@ vim_src_compile() { myconf="${myconf} --with-modified-by=Gentoo-${PVR}" econf ${myconf} || die "vim configure failed" +} + +vim_src_compile() { + has src_configure ${TO_EXPORT} || vim_src_configure # The following allows emake to be used make -j1 -C src auto/osdef.h objects || die "make failed" |