11.11.2013 19:32, Sergey Popov пишет: > Some work on splitting these helper functions was done earlier, and then > we have got request(bug #479744), so, with ACK from pesa, i would like > to propose this new eclass here and some times after - another proposal > with making qt4-r2 eclass depends on this one to prevent code duplication. > > So, here it is(directly from qt overlay): > > > > # Copyright 1999-2013 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > # $Header: $ > > # @ECLASS: qmake-utils.eclass > # @MAINTAINER: > # Qt herd <[email protected]> > # @AUTHOR: > # Davide Pesavento <[email protected]> > # @BLURB: Common functions for qmake-based packages. > # @DESCRIPTION: > # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. > > if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then > ___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank" > > inherit eutils multilib toolchain-funcs > > # @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. > 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 > } > > # @VARIABLE: EQMAKE4_EXCLUDE > # @DEFAULT_UNSET > # @DESCRIPTION: > # List of files to be excluded from eqmake4 CONFIG processing. > # Paths are relative to the current working directory (usually ${S}). > # > # Example: EQMAKE4_EXCLUDE="ignore/me.pro foo/*" > > # @FUNCTION: eqmake4 > # @USAGE: [project_file] [parameters to qmake] > # @DESCRIPTION: > # Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will > # look for it in the current directory (${S}, non-recursively). If more > # than one project file are found, then ${PN}.pro is processed, provided > # that it exists. Otherwise eqmake4 fails. > # > # All other arguments are appended unmodified to qmake command line. > # > # For recursive build systems, i.e. those based on the subdirs template, > # you should run eqmake4 on the top-level project file only, unless you > # have a valid reason to do otherwise. During the building, qmake will > # be automatically re-invoked with the right arguments on every directory > # specified inside the top-level project file. > eqmake4() { > debug-print-function ${FUNCNAME} "$@" > > has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= > > ebegin "Running qmake" > > local qmake_args=("$@") > > # check if project file was passed as a first argument > # if not, then search for it > local regexp='.*\.pro' > if ! [[ ${1} =~ ${regexp} ]]; then > local project_file=$(qmake-utils_find_pro_file) > if [[ -z ${project_file} ]]; then > echo > eerror "No project files found in '${PWD}'!" > eerror "This shouldn't happen - please send a bug > report to > https://bugs.gentoo.org/"; > echo > die "eqmake4 failed" > fi > qmake_args+=("${project_file}") > fi > > # make sure CONFIG variable is correctly set > # for both release and debug builds > local config_add="release" > local config_remove="debug" > if has debug ${IUSE} && use debug; then > config_add="debug" > config_remove="release" > fi > > local awkscript='BEGIN { > printf "### eqmake4 was here ###\n" > file; > printf "CONFIG -= debug_and_release %s\n", > remove >> file; > printf "CONFIG += %s\n\n", add >> file; > fixed=0; > } > /^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ { > if (gsub("\\<((" remove > ")|(debug_and_release))\\>", "") > 0) { > fixed=1; > } > } > /^[[:blank:]]*CONFIG[[:blank:]]*-=/ { > if (gsub("\\<" add "\\>", "") > 0) { > fixed=1; > } > } > { > print >> file; > } > END { > print fixed; > }' > > [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_push -o noglob > > local file > while read file; do > local excl > for excl in ${EQMAKE4_EXCLUDE}; do > [[ ${file} == ${excl} ]] && continue 2 > done > grep -q '^### eqmake4 was here ###$' "${file}" && continue > > local retval=$({ > rm -f "${file}" || echo FAIL > awk -v file="${file}" \ > -v add=${config_add} \ > -v remove=${config_remove} \ > -- "${awkscript}" || echo FAIL > } < "${file}") > > if [[ ${retval} == 1 ]]; then > einfo " - fixed CONFIG in ${file}" > elif [[ ${retval} != 0 ]]; then > eerror " - error while processing ${file}" > die "eqmake4 failed to process ${file}" > fi > done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null) > > [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop > > "${EPREFIX}"/usr/bin/qmake \ > -makefile \ > QTDIR="${EPREFIX}"/usr/$(get_libdir) \ > QMAKE="${EPREFIX}"/usr/bin/qmake \ > QMAKE_AR="$(tc-getAR) cqs" \ > QMAKE_CC="$(tc-getCC)" \ > QMAKE_CXX="$(tc-getCXX)" \ > QMAKE_LINK="$(tc-getCXX)" \ > QMAKE_LINK_C="$(tc-getCC)" \ > QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ > QMAKE_RANLIB= \ > QMAKE_STRIP= \ > QMAKE_CFLAGS="${CFLAGS}" \ > QMAKE_CFLAGS_RELEASE= \ > QMAKE_CFLAGS_DEBUG= \ > QMAKE_CXXFLAGS="${CXXFLAGS}" \ > QMAKE_CXXFLAGS_RELEASE= \ > QMAKE_CXXFLAGS_DEBUG= \ > QMAKE_LFLAGS="${LDFLAGS}" \ > QMAKE_LFLAGS_RELEASE= \ > QMAKE_LFLAGS_DEBUG= \ > QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \ > QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \ > QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \ > "${qmake_args[@]}" > > # was qmake successful? > if ! eend $? ; then > echo > eerror "Running qmake has failed! (see above for details)" > eerror "This shouldn't happen - please send a bug report to > https://bugs.gentoo.org/"; > echo > die "eqmake4 failed" > fi > } > > # @FUNCTION: eqmake5 > # @USAGE: [arguments for qmake] > # @DESCRIPTION: > # Wrapper for Qt5's qmake. All arguments are passed to qmake. > # > # For recursive build systems, i.e. those based on the subdirs template, > # you should run eqmake5 on the top-level project file only, unless you > # have a valid reason to do otherwise. During the building, qmake will > # be automatically re-invoked with the right arguments on every directory > # specified inside the top-level project file. > eqmake5() { > debug-print-function ${FUNCNAME} "$@" > > has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= > > ebegin "Running qmake" > > "${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \ > -makefile \ > QMAKE_AR="$(tc-getAR) cqs" \ > QMAKE_CC="$(tc-getCC)" \ > QMAKE_CXX="$(tc-getCXX)" \ > QMAKE_LINK="$(tc-getCXX)" \ > QMAKE_LINK_C="$(tc-getCC)" \ > QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ > QMAKE_RANLIB= \ > QMAKE_STRIP= \ > QMAKE_CFLAGS="${CFLAGS}" \ > QMAKE_CFLAGS_RELEASE= \ > QMAKE_CFLAGS_DEBUG= \ > QMAKE_CXXFLAGS="${CXXFLAGS}" \ > QMAKE_CXXFLAGS_RELEASE= \ > QMAKE_CXXFLAGS_DEBUG= \ > QMAKE_LFLAGS="${LDFLAGS}" \ > QMAKE_LFLAGS_RELEASE= \ > QMAKE_LFLAGS_DEBUG= \ > "$@" > > # was qmake successful? > if ! eend $? ; then > echo > eerror "Running qmake has failed! (see above for details)" > eerror "This shouldn't happen - please send a bug report to > https://bugs.gentoo.org/"; > echo > die "eqmake5 failed" > fi > } > > fi > >
Ok, no objections/comments for more than 3 weeks. I committed it. Later i will post diff for qt4-r2 eclass. -- Best regards, Sergey Popov Gentoo developer Gentoo Desktop Effects project lead Gentoo Qt project lead Gentoo Proxy maintainers project lead
signature.asc
Description: OpenPGP digital signature
