* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass multilib-build.eclass
@ 2013-02-01 21:39 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-01 21:39 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/01 21:39:50
Modified: ChangeLog autotools-multilib.eclass
Added: multilib-build.eclass
Log:
Introduce a common multilib-build eclass to help building packages for multilib, and use the new ABI_X86 flags in it.
Revision Changes Path
1.658 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.658&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.658&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.657&r2=1.658
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -r1.657 -r1.658
--- ChangeLog 31 Jan 2013 19:59:54 -0000 1.657
+++ ChangeLog 1 Feb 2013 21:39:50 -0000 1.658
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.657 2013/01/31 19:59:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.658 2013/02/01 21:39:50 mgorny Exp $
+
+ 01 Feb 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
+ +multilib-build.eclass:
+ Introduce a common multilib-build eclass to help building packages for
+ multilib, and use the new ABI_X86 flags in it.
31 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass:
Allow build of multiple plugins in different directories. Make variables more
1.8 eclass/autotools-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?r1=1.7&r2=1.8
Index: autotools-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- autotools-multilib.eclass 26 Jan 2013 11:39:41 -0000 1.7
+++ autotools-multilib.eclass 1 Feb 2013 21:39:50 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.7 2013/01/26 11:39:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.8 2013/02/01 21:39:50 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -29,96 +29,56 @@
die "${ECLASS}: multilib support requires out-of-source builds."
fi
-inherit autotools-utils multilib multiprocessing
+inherit autotools-utils multilib-build
EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-IUSE=multilib
-
-# @ECLASS-VARIABLE: MULTILIB_USEDEP
-# @DESCRIPTION:
-# The USE-dependency to be used on dependencies (libraries) needing
-# to support multilib as well.
-#
-# Example use:
-# @CODE
-# RDEPEND="dev-libs/libfoo[${MULTILIB_USEDEP}]
-# net-libs/libbar[ssl,${MULTILIB_USEDEP}]"
-# @CODE
-MULTILIB_USEDEP='multilib(-)?'
-
-# @FUNCTION: autotools-multilib_foreach_abi
-# @USAGE: argv...
-# @DESCRIPTION:
-# If multilib support is enabled, sets the toolchain up for each
-# supported ABI along with the ABI variable and correct BUILD_DIR,
-# and runs the given commands with them.
-#
-# If multilib support is disabled, it just runs the commands. No setup
-# is done.
-autotools-multilib_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
-
- if use multilib; then
- local ABI
- for ABI in $(get_all_abis); do
- multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
- done
- else
- "${@}"
- fi
-}
-
-# @FUNCTION: autotools-multilib_parallel_foreach_abi
-# @USAGE: argv...
-# @DESCRIPTION:
-# If multilib support is enabled, sets the toolchain up for each
-# supported ABI along with the ABI variable and correct BUILD_DIR,
-# and runs the given commands with them. The commands are run
-# in parallel with number of jobs being determined from MAKEOPTS.
-#
-# If multilib support is disabled, it just runs the commands. No setup
-# is done.
-#
-# Useful for running configure scripts.
-autotools-multilib_parallel_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
-
- if use multilib; then
- multijob_init
-
- local ABI
- for ABI in $(get_all_abis); do
- (
- multijob_child_init
-
- multilib_toolchain_setup "${ABI}"
- BUILD_DIR=${initial_dir%%/}-${ABI}
- "${@}"
- ) &
-
- multijob_post_fork
- done
-
- multijob_finish
- else
- "${@}"
- fi
-}
-
autotools-multilib_src_configure() {
- autotools-multilib_parallel_foreach_abi autotools-utils_src_configure
+ multilib_parallel_foreach_abi autotools-utils_src_configure
}
autotools-multilib_src_compile() {
- autotools-multilib_foreach_abi autotools-utils_src_compile
+ multilib_foreach_abi autotools-utils_src_compile
}
autotools-multilib_src_test() {
- autotools-multilib_foreach_abi autotools-utils_src_test
+ multilib_foreach_abi autotools-utils_src_test
}
autotools-multilib_src_install() {
- autotools-multilib_foreach_abi autotools-utils_src_install
+ autotools-multilib_secure_install() {
+ autotools-utils_src_install
+
+ # Make sure all headers are the same for each ABI.
+ autotools-multilib_cksum() {
+ find "${ED}"usr/include -type f \
+ -exec cksum {} + | sort -k2
+ }
+
+ local cksum=$(autotools-multilib_cksum)
+ local cksum_file=${T}/.autotools-multilib_cksum
+
+ if [[ -f ${cksum_file} ]]; then
+ local cksum_prev=$(< "${cksum_file}")
+
+ if [[ ${cksum} != ${cksum_prev} ]]; then
+ echo "${cksum}" > "${cksum_file}.new"
+
+ eerror "Header files have changed between ABIs."
+
+ if type -p diff &>/dev/null; then
+ eerror "$(diff -du "${cksum_file}" "${cksum_file}.new")"
+ else
+ eerror "Old checksums in: ${cksum_file}"
+ eerror "New checksums in: ${cksum_file}.new"
+ fi
+
+ die "Header checksum mismatch, aborting."
+ fi
+ else
+ echo "${cksum}" > "${cksum_file}"
+ fi
+ }
+
+ multilib_foreach_abi autotools-multilib_secure_install
}
1.1 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.1&content-type=text/plain
Index: multilib-build.eclass
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.1 2013/02/01 21:39:50 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
# Michał Górny <mgorny@gentoo.org>
# @BLURB: flags and utility functions for building multilib packages
# @DESCRIPTION:
# The multilib-build.eclass exports USE flags and utility functions
# necessary to build packages for multilib in a clean and uniform
# manner.
#
# Please note that dependency specifications for multilib-capable
# dependencies shall use the USE dependency string in ${MULTILIB_USEDEP}
# to properly request multilib enabled.
if [[ ! ${_MULTILIB_BUILD} ]]; then
# EAPI=5 is required for meaningful MULTILIB_USEDEP.
case ${EAPI:-0} in
5) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
inherit multilib multiprocessing
# @ECLASS-VARIABLE: _MULTILIB_FLAGS
# @INTERNAL
# @DESCRIPTION:
# The list of multilib flags and corresponding ABI values.
_MULTILIB_FLAGS=(
abi_x86_32:x86
abi_x86_64:amd64
)
# @ECLASS-VARIABLE: MULTILIB_USEDEP
# @DESCRIPTION:
# The USE-dependency to be used on dependencies (libraries) needing
# to support multilib as well.
#
# Example use:
# @CODE
# RDEPEND="dev-libs/libfoo[${MULTILIB_USEDEP}]
# net-libs/libbar[ssl,${MULTILIB_USEDEP}]"
# @CODE
_multilib_build_set_globals() {
local flags=( "${_MULTILIB_FLAGS[@]%:*}" )
local usedeps=${flags[@]/%/(-)?}
IUSE=${flags[*]}
MULTILIB_USEDEP=${usedeps// /,}
}
_multilib_build_set_globals
# @FUNCTION: multilib_get_enabled_abis
# @DESCRIPTION:
# Return the ordered list of enabled ABIs if multilib builds
# are enabled. The best (most preferred) ABI will come last.
#
# If multilib is disabled, the default ABI will be returned
# in order to enforce consistent testing with multilib code.
multilib_get_enabled_abis() {
debug-print-function ${FUNCNAME} "${@}"
local abis=( $(get_all_abis) )
local abi i found
for abi in "${abis[@]}"; do
for i in "${_MULTILIB_FLAGS[@]}"; do
local m_abi=${i#*:}
local m_flag=${i%:*}
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
echo "${abi}"
found=1
fi
done
done
if [[ ! ${found} ]]; then
debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${DEFAULT_ABI}"
echo ${DEFAULT_ABI}
fi
}
# @FUNCTION: multilib_foreach_abi
# @USAGE: <argv>...
# @DESCRIPTION:
# If multilib support is enabled, sets the toolchain up for each
# supported ABI along with the ABI variable and correct BUILD_DIR,
# and runs the given commands with them.
#
# If multilib support is disabled, it just runs the commands. No setup
# is done.
multilib_foreach_abi() {
local initial_dir=${BUILD_DIR:-${S}}
local ABI
for ABI in $(multilib_get_enabled_abis); do
multilib_toolchain_setup "${ABI}"
BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
done
}
# @FUNCTION: multilib_parallel_foreach_abi
# @USAGE: <argv>...
# @DESCRIPTION:
# If multilib support is enabled, sets the toolchain up for each
# supported ABI along with the ABI variable and correct BUILD_DIR,
# and runs the given commands with them. The commands are run
# in parallel with number of jobs being determined from MAKEOPTS.
#
# If multilib support is disabled, it just runs the commands. No setup
# is done.
#
# Useful for running configure scripts.
multilib_parallel_foreach_abi() {
local initial_dir=${BUILD_DIR:-${S}}
multijob_init
local ABI
for ABI in $(multilib_get_enabled_abis); do
(
multijob_child_init
multilib_toolchain_setup "${ABI}"
BUILD_DIR=${initial_dir%%/}-${ABI}
"${@}"
) &
multijob_post_fork
done
multijob_finish
}
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass multilib-build.eclass
@ 2013-02-10 11:44 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2013-02-10 11:44 UTC (permalink / raw
To: gentoo-commits
mgorny 13/02/10 11:44:00
Modified: ChangeLog autotools-multilib.eclass
multilib-build.eclass
Log:
Move header checking function into multilib-build for wider reuse.
Revision Changes Path
1.671 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.671&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.671&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.670&r2=1.671
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- ChangeLog 10 Feb 2013 11:42:48 -0000 1.670
+++ ChangeLog 10 Feb 2013 11:44:00 -0000 1.671
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.670 2013/02/10 11:42:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.671 2013/02/10 11:44:00 mgorny Exp $
+
+ 10 Feb 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
+ multilib-build.eclass:
+ Move header checking function into multilib-build for wider reuse.
10 Feb 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
QA-warn if epunt_cxx does not find any checks to punt.
1.9 eclass/autotools-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?r1=1.8&r2=1.9
Index: autotools-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autotools-multilib.eclass 1 Feb 2013 21:39:50 -0000 1.8
+++ autotools-multilib.eclass 10 Feb 2013 11:44:00 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.8 2013/02/01 21:39:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.9 2013/02/10 11:44:00 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -50,34 +50,7 @@
autotools-utils_src_install
# Make sure all headers are the same for each ABI.
- autotools-multilib_cksum() {
- find "${ED}"usr/include -type f \
- -exec cksum {} + | sort -k2
- }
-
- local cksum=$(autotools-multilib_cksum)
- local cksum_file=${T}/.autotools-multilib_cksum
-
- if [[ -f ${cksum_file} ]]; then
- local cksum_prev=$(< "${cksum_file}")
-
- if [[ ${cksum} != ${cksum_prev} ]]; then
- echo "${cksum}" > "${cksum_file}.new"
-
- eerror "Header files have changed between ABIs."
-
- if type -p diff &>/dev/null; then
- eerror "$(diff -du "${cksum_file}" "${cksum_file}.new")"
- else
- eerror "Old checksums in: ${cksum_file}"
- eerror "New checksums in: ${cksum_file}.new"
- fi
-
- die "Header checksum mismatch, aborting."
- fi
- else
- echo "${cksum}" > "${cksum_file}"
- fi
+ multilib_check_headers
}
multilib_foreach_abi autotools-multilib_secure_install
1.2 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.1&r2=1.2
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multilib-build.eclass 1 Feb 2013 21:39:50 -0000 1.1
+++ multilib-build.eclass 10 Feb 2013 11:44:00 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.1 2013/02/01 21:39:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.2 2013/02/10 11:44:00 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -137,5 +137,43 @@
multijob_finish
}
+# @FUNCTION: multilib_check_headers
+# @DESCRIPTION:
+# Check whether the header files are consistent between ABIs.
+#
+# This function needs to be called after each ABI's installation phase.
+# It obtains the header file checksums and compares them with previous
+# runs (if any). Dies if header files differ.
+multilib_check_headers() {
+ _multilib_header_cksum() {
+ find "${ED}"usr/include -type f \
+ -exec cksum {} + | sort -k2
+ }
+
+ local cksum=$(_multilib_header_cksum)
+ local cksum_file=${T}/.multilib_header_cksum
+
+ if [[ -f ${cksum_file} ]]; then
+ local cksum_prev=$(< "${cksum_file}")
+
+ if [[ ${cksum} != ${cksum_prev} ]]; then
+ echo "${cksum}" > "${cksum_file}.new"
+
+ eerror "Header files have changed between ABIs."
+
+ if type -p diff &>/dev/null; then
+ eerror "$(diff -du "${cksum_file}" "${cksum_file}.new")"
+ else
+ eerror "Old checksums in: ${cksum_file}"
+ eerror "New checksums in: ${cksum_file}.new"
+ fi
+
+ die "Header checksum mismatch, aborting."
+ fi
+ else
+ echo "${cksum}" > "${cksum_file}"
+ fi
+}
+
_MULTILIB_BUILD=1
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass multilib-build.eclass
@ 2013-05-14 17:33 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2013-05-14 17:33 UTC (permalink / raw
To: gentoo-commits
mgorny 13/05/14 17:33:08
Modified: ChangeLog autotools-multilib.eclass
multilib-build.eclass
Log:
Enable EAPI=4 on multilib eclasses.
Revision Changes Path
1.821 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.821&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.821&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.820&r2=1.821
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- ChangeLog 11 May 2013 12:46:32 -0000 1.820
+++ ChangeLog 14 May 2013 17:33:08 -0000 1.821
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.820 2013/05/11 12:46:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.821 2013/05/14 17:33:08 mgorny Exp $
+
+ 14 May 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
+ multilib-build.eclass:
+ Enable EAPI=4 on multilib eclasses.
11 May 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass,
haskell-cabal.eclass:
1.16 eclass/autotools-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?r1=1.15&r2=1.16
Index: autotools-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- autotools-multilib.eclass 7 Apr 2013 16:56:14 -0000 1.15
+++ autotools-multilib.eclass 14 May 2013 17:33:08 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.15 2013/04/07 16:56:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.16 2013/05/14 17:33:08 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -19,9 +19,9 @@
# enabled. Thus, it is impossible to use AUTOTOOLS_IN_SOURCE_BUILD with
# it.
-# EAPI=5 is required for meaningful MULTILIB_USEDEP.
+# EAPI=4 is required for meaningful MULTILIB_USEDEP.
case ${EAPI:-0} in
- 5) ;;
+ 4|5) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
1.12 eclass/multilib-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.11&r2=1.12
Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- multilib-build.eclass 7 Apr 2013 16:56:14 -0000 1.11
+++ multilib-build.eclass 14 May 2013 17:33:08 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.11 2013/04/07 16:56:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.12 2013/05/14 17:33:08 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -17,9 +17,9 @@
if [[ ! ${_MULTILIB_BUILD} ]]; then
-# EAPI=5 is required for meaningful MULTILIB_USEDEP.
+# EAPI=4 is required for meaningful MULTILIB_USEDEP.
case ${EAPI:-0} in
- 5) ;;
+ 4|5) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-14 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-14 17:33 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass multilib-build.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2013-02-10 11:44 Michal Gorny (mgorny)
2013-02-01 21:39 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox