Gentoo Archives: gentoo-dev

From: Michael Palimaka <kensington@g.o>
To: gentoo-dev@l.g.o
Cc: Michael Palimaka <kensington@g.o>
Subject: [gentoo-dev] [PATCH 01/15] cmake-utils.eclass: reorder a bit
Date: Wed, 20 Jan 2016 10:44:40
Message-Id: 1453286593-26823-2-git-send-email-kensington@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/15] EAPI 6 support for cmake-utils.eclas by Michael Palimaka
1 ---
2 eclass/cmake-utils.eclass | 17 +++++++++--------
3 1 file changed, 9 insertions(+), 8 deletions(-)
4
5 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
6 index fd53b3a..cc4c06b 100644
7 --- a/eclass/cmake-utils.eclass
8 +++ b/eclass/cmake-utils.eclass
9 @@ -112,6 +112,15 @@ CMAKE_REMOVE_MODULES="${CMAKE_REMOVE_MODULES:-yes}"
10 # for econf and is needed to pass TRY_RUN results when cross-compiling.
11 # Should be set by user in a per-package basis in /etc/portage/package.env.
12
13 +case ${EAPI} in
14 + 2|3|4|5) : ;;
15 + *) die "EAPI=${EAPI:-0} is not supported" ;;
16 +esac
17 +
18 +inherit toolchain-funcs multilib flag-o-matic eutils versionator
19 +
20 +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
21 +
22 CMAKEDEPEND=""
23 case ${WANT_CMAKE} in
24 always)
25 @@ -121,14 +130,6 @@ case ${WANT_CMAKE} in
26 CMAKEDEPEND+="${WANT_CMAKE}? ( "
27 ;;
28 esac
29 -inherit toolchain-funcs multilib flag-o-matic eutils versionator
30 -
31 -case ${EAPI} in
32 - 2|3|4|5) : ;;
33 - *) die "EAPI=${EAPI:-0} is not supported" ;;
34 -esac
35 -
36 -EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
37
38 case ${CMAKE_MAKEFILE_GENERATOR} in
39 emake)
40 --
41 2.4.10