diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-25 18:14:11 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-26 21:16:22 +0100 |
| commit | 0b0a3f9d0b305ce2b73a9d6ad30c874f19b8d5e3 (patch) | |
| tree | 0522fcdb1ee5d9b123a9d2cc92972b83a7c9a9d7 | |
| parent | qmake-utils.eclass: Drop obsolete EAPI-6 support, ban qt4* functions (diff) | |
| download | gentoo-0b0a3f9d0b305ce2b73a9d6ad30c874f19b8d5e3.tar.gz gentoo-0b0a3f9d0b305ce2b73a9d6ad30c874f19b8d5e3.tar.bz2 gentoo-0b0a3f9d0b305ce2b73a9d6ad30c874f19b8d5e3.zip | |
qmake-utils.eclass: Ban qmake-utils_find_pro_file() as well
Always marked as @INTERNAL and no remaining users in gentoo.git.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/qmake-utils.eclass | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 79dbc8c0742e..0d49eb94382c 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -22,7 +22,7 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit estack toolchain-funcs +inherit toolchain-funcs # @FUNCTION: _qmake-utils_banned_func # @INTERNAL @@ -109,38 +109,11 @@ qt5_get_plugindir() { } # @FUNCTION: qmake-utils_find_pro_file -# @RETURN: zero or one qmake .pro file names # @INTERNAL # @DESCRIPTION: -# Outputs a project file name that can be passed to eqmake. -# 0 *.pro files found --> outputs null string; -# 1 *.pro file found --> outputs its name; -# 2 or more *.pro files found --> if "${PN}.pro" or -# "$(basename ${S}).pro" are there, outputs one of them. +# Banned. qmake-utils_find_pro_file() { - local dir_name=$(basename "${S}") - - # set nullglob to avoid expanding *.pro to the literal - # string "*.pro" when there are no matching files - eshopts_push -s nullglob - local pro_files=(*.pro) - eshopts_pop - - case ${#pro_files[@]} in - 0) - : ;; - 1) - echo "${pro_files}" - ;; - *) - for pro_file in "${pro_files[@]}"; do - if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then - echo "${pro_file}" - break - fi - done - ;; - esac + _qmake-utils_banned_func } # @FUNCTION: eqmake4 |