aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Quentin Glidic <sardemff7+git@sardemff7.net> 2012-03-18 13:28:14 +0100
committerAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2012-09-19 00:06:58 +0200
commit5f0f4decc5abcf6f26a9ffd2e9b58b73123c9632 (patch)
tree612c0a47229a94eca5976db51cd680fcc78f30c1
parent94a1821fb75a519d9cc482077d109803e76d95c2 (diff)
downloadpaludis-5f0f4decc5abcf6f26a9ffd2e9b58b73123c9632.tar.gz
paludis-5f0f4decc5abcf6f26a9ffd2e9b58b73123c9632.tar.xz
exheres-0: Add DEFAULT_SRC_CONFIGURE_TESTS
These allow to pass conditional parameters to configure script depending upon the expected tests
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf1
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/list_functions.bash7
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_configure.bash6
3 files changed, 13 insertions, 1 deletions
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index bb825fa..a91c54c 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -87,6 +87,7 @@ must_not_change_after_source_variables = \
DEFAULT_SRC_CONFIGURE_PARAMS \
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES \
DEFAULT_SRC_CONFIGURE_OPTION_WITHS \
+ DEFAULT_SRC_CONFIGURE_TESTS \
DEFAULT_SRC_INSTALL_PARAMS \
DEFAULT_SRC_INSTALL_EXTRA_DOCS \
DEFAULT_SRC_INSTALL_EXTRA_PREFIXES \
diff --git a/paludis/repositories/e/ebuild/exheres-0/list_functions.bash b/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
index ae8316e..fbe66ff 100644
--- a/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
@@ -96,6 +96,13 @@ hasq()
expecting_tests()
{
local r=$(paludis_pipe_command EXPECTING_TESTS "$EAPI" "${1:---any}" )
+ if [[ "${#@}" -gt 1 ]] ; then
+ if [[ ${r%%;*} -eq 0 ]] ; then
+ echo "${2}"
+ else
+ echo "${3}"
+ fi
+ fi
return ${r%%;*}
}
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
index 1de12a7..4999c1b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
@@ -26,7 +26,8 @@ default_src_configure()
ebuild_verify_not_changed_from_global_scope \
DEFAULT_SRC_CONFIGURE_PARAMS \
DEFAULT_SRC_CONFIGURE_OPTION_ENABLES \
- DEFAULT_SRC_CONFIGURE_OPTION_WITHS
+ DEFAULT_SRC_CONFIGURE_OPTION_WITHS \
+ DEFAULT_SRC_CONFIGURE_TESTS
if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
econf \
@@ -36,6 +37,9 @@ default_src_configure()
done ) \
$(for s in "${DEFAULT_SRC_CONFIGURE_OPTION_WITHS[@]}" ; do \
option_with ${s} ; \
+ done ) \
+ $(for s in "${DEFAULT_SRC_CONFIGURE_TESTS[@]}" ; do \
+ expecting_tests ${s} ; \
done )
fi
}