commit: a3f4587c3248f4def9a667303dec55df3d6012f8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 12:32:08 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 12:32:08 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3f4587c
cmake-utils.eclass: namespace some functions
eclass/cmake-utils.eclass | 70 +++++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dea35fd..63ab8e6 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -158,7 +158,7 @@ DEPEND="${CMAKEDEPEND}"
unset CMAKEDEPEND
# Internal functions used by cmake-utils_use_*
-_use_me_now() {
+_cmake_use_me_now() {
debug-print-function ${FUNCNAME} "$@"
local arg=$2
@@ -180,7 +180,7 @@ _use_me_now() {
done
fi
}
-_use_me_now_inverted() {
+_cmake_use_me_now_inverted() {
debug-print-function ${FUNCNAME} "$@"
local arg=$2
@@ -206,7 +206,7 @@ _use_me_now_inverted() {
}
# Determine using IN or OUT source build
-_check_build_dir() {
+_cmake_check_build_dir() {
: ${CMAKE_USE_DIR:=${S}}
if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
# we build in source dir
@@ -238,7 +238,7 @@ _check_build_dir() {
}
# Determine which generator to use
-_generator_to_use() {
+_cmake_generator_to_use() {
local generator_name
case ${CMAKE_MAKEFILE_GENERATOR} in
@@ -295,7 +295,7 @@ comment_add_subdirectory() {
#
# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
# and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
+cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
# @FUNCTION: cmake-utils_use_enable
# @USAGE: <USE flag> [flag name]
@@ -304,7 +304,7 @@ cmake-utils_use_with() { _use_me_now WITH_ "$@" ; }
#
# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
# and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; }
+cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
# @FUNCTION: cmake-utils_use_find_package
# @USAGE: <USE flag> <package name>
@@ -319,7 +319,7 @@ cmake-utils_use_find_package() {
die "Usage: cmake-utils_use_find_package <USE flag> <package
name>"
fi
- _use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
+ _cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
}
# @FUNCTION: cmake-utils_use_disable
@@ -329,7 +329,7 @@ cmake-utils_use_find_package() {
#
# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
# and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; }
+cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
# @FUNCTION: cmake-utils_use_no
# @USAGE: <USE flag> [flag name]
@@ -338,7 +338,7 @@ cmake-utils_use_disable() { _use_me_now_inverted DISABLE_
"$@" ; }
#
# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
# and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; }
+cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
# @FUNCTION: cmake-utils_use_want
# @USAGE: <USE flag> [flag name]
@@ -347,7 +347,7 @@ cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; }
#
# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
# and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _use_me_now WANT_ "$@" ; }
+cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
# @FUNCTION: cmake-utils_use_build
# @USAGE: <USE flag> [flag name]
@@ -356,7 +356,7 @@ cmake-utils_use_want() { _use_me_now WANT_ "$@" ; }
#
# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
# and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; }
+cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
# @FUNCTION: cmake-utils_use_has
# @USAGE: <USE flag> [flag name]
@@ -365,7 +365,7 @@ cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; }
#
# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
# and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; }
+cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
# @FUNCTION: cmake-utils_use_use
# @USAGE: <USE flag> [flag name]
@@ -374,7 +374,7 @@ cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; }
#
# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
# and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
+cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
# @FUNCTION: cmake-utils_use
# @USAGE: <USE flag> [flag name]
@@ -383,7 +383,7 @@ cmake-utils_use_use() { _use_me_now USE_ "$@" ; }
#
# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
# and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _use_me_now "" "$@" ; }
+cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
# @FUNCTION: cmake-utils_useno
# @USAGE: <USE flag> [flag name]
@@ -392,11 +392,11 @@ cmake-utils_use() { _use_me_now "" "$@" ; }
#
# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
# and -DNOFOO=ON if it is disabled.
-cmake-utils_useno() { _use_me_now_inverted "" "$@" ; }
+cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
# Internal function for modifying hardcoded definitions.
# Removes dangerous definitions that override Gentoo settings.
-_modify-cmakelists() {
+_cmake_modify-cmakelists() {
debug-print-function ${FUNCNAME} "$@"
# Only edit the files once
@@ -429,7 +429,7 @@ _modify-cmakelists() {
# temporary function for moving cmake cleanups from from src_configure ->
src_prepare.
# bug #378850
-_cleanup_cmake() {
+_cmake_cleanup_cmake() {
: ${CMAKE_USE_DIR:=${S}}
if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
@@ -448,7 +448,7 @@ _cleanup_cmake() {
fi
# Remove dangerous things.
- _modify-cmakelists
+ _cmake_modify-cmakelists
}
enable_cmake-utils_src_prepare() {
@@ -458,7 +458,7 @@ enable_cmake-utils_src_prepare() {
if ! has "${EAPI:-0}" 2 3 4 5 ; then
default_src_prepare
- _cleanup_cmake
+ _cmake_cleanup_cmake
else
debug-print "$FUNCNAME: PATCHES=$PATCHES"
[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -488,9 +488,9 @@ enable_cmake-utils_src_prepare() {
enable_cmake-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
- has "${EAPI:-0}" 2 3 4 5 && _cleanup_cmake
+ has "${EAPI:-0}" 2 3 4 5 && _cmake_cleanup_cmake
- _check_build_dir
+ _cmake_check_build_dir
# Fix xdg collision with sandbox
local -x XDG_CONFIG_HOME="${T}"
@@ -627,7 +627,7 @@ enable_cmake-utils_src_configure() {
local cmakeargs=(
${warn_unused_cli}
-C "${common_config}"
- -G "$(_generator_to_use)"
+ -G "$(_cmake_generator_to_use)"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}"
"${mycmakeargs_local[@]}"
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
@@ -676,11 +676,11 @@ _ninjaopts_from_makeopts() {
export NINJAOPTS="${ninjaopts[*]}"
}
-# @FUNCTION: ninja_src_make
+# @FUNCTION: _cmake_ninja_src_make
# @INTERNAL
# @DESCRIPTION:
# Build the package using ninja generator
-ninja_src_make() {
+_cmake_ninja_src_make() {
debug-print-function ${FUNCNAME} "$@"
[[ -e build.ninja ]] || die "build.ninja not found. Error during
configure stage."
@@ -697,11 +697,11 @@ ninja_src_make() {
"$@" || die
}
-# @FUNCTION: emake_src_make
+# @FUNCTION: _cmake_emake_src_make
# @INTERNAL
# @DESCRIPTION:
# Build the package using make generator
-emake_src_make() {
+_cmake_emake_src_make() {
debug-print-function ${FUNCNAME} "$@"
[[ -e Makefile ]] || die "Makefile not found. Error during configure
stage."
@@ -721,7 +721,7 @@ emake_src_make() {
cmake-utils_src_make() {
debug-print-function ${FUNCNAME} "$@"
- _check_build_dir
+ _cmake_check_build_dir
pushd "${BUILD_DIR}" > /dev/null || die
${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
@@ -732,7 +732,7 @@ cmake-utils_src_make() {
enable_cmake-utils_src_test() {
debug-print-function ${FUNCNAME} "$@"
- _check_build_dir
+ _cmake_check_build_dir
pushd "${BUILD_DIR}" > /dev/null || die
[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping.";
return 0 ; }
@@ -763,7 +763,7 @@ enable_cmake-utils_src_test() {
enable_cmake-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
- _check_build_dir
+ _cmake_check_build_dir
pushd "${BUILD_DIR}" > /dev/null || die
DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died
running ${CMAKE_MAKEFILE_GENERATOR} install"
popd > /dev/null || die
@@ -777,7 +777,7 @@ enable_cmake-utils_src_install() {
# @DESCRIPTION:
# Apply ebuild and user patches.
cmake-utils_src_prepare() {
- _execute_optionally "src_prepare" "$@"
+ _cmake_execute_optionally "src_prepare" "$@"
}
# @FUNCTION: cmake-utils_src_configure
@@ -785,7 +785,7 @@ cmake-utils_src_prepare() {
# General function for configuring with cmake. Default behaviour is to start an
# out-of-source build.
cmake-utils_src_configure() {
- _execute_optionally "src_configure" "$@"
+ _cmake_execute_optionally "src_configure" "$@"
}
# @FUNCTION: cmake-utils_src_compile
@@ -793,25 +793,25 @@ cmake-utils_src_configure() {
# General function for compiling with cmake.
# Automatically detects the build type. All arguments are passed to emake.
cmake-utils_src_compile() {
- _execute_optionally "src_compile" "$@"
+ _cmake_execute_optionally "src_compile" "$@"
}
# @FUNCTION: cmake-utils_src_test
# @DESCRIPTION:
# Function for testing the package. Automatically detects the build type.
cmake-utils_src_test() {
- _execute_optionally "src_test" "$@"
+ _cmake_execute_optionally "src_test" "$@"
}
# @FUNCTION: cmake-utils_src_install
# @DESCRIPTION:
# Function for installing the package. Automatically detects the build type.
cmake-utils_src_install() {
- _execute_optionally "src_install" "$@"
+ _cmake_execute_optionally "src_install" "$@"
}
# Optionally executes phases based on WANT_CMAKE variable/USE flag.
-_execute_optionally() {
+_cmake_execute_optionally() {
local phase="$1" ; shift
if [[ ${WANT_CMAKE} = always ]]; then
enable_cmake-utils_${phase} "$@"
