diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 605d13ca291..88eeaabd585 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -498,18 +498,33 @@ ecm_punt_po_install() { # @FUNCTION: ecm_pkg_pretend # @DESCRIPTION: # Checks if the active compiler meets the minimum version requirements. -# phase function is only exported if KDE_GCC_MINIMAL is defined. +# Phase function is only exported if KFMIN is <6.9.0 and KDE_GCC_MINIMAL +# is defined. ecm_pkg_pretend() { debug-print-function ${FUNCNAME} "$@" - _ecm_check_gcc_version + if ver_test ${KFMIN} -ge 6.9.0; then + eqawarn "QA notice: ${FUNCNAME} has become a no-op." + eqawarn "It is longer being exported with KFMIN >=6.9.0." + else + _ecm_check_gcc_version + fi } # @FUNCTION: ecm_pkg_setup # @DESCRIPTION: # Checks if the active compiler meets the minimum version requirements. +# Phase function is only exported if KFMIN is <6.9.0. ecm_pkg_setup() { debug-print-function ${FUNCNAME} "$@" - _ecm_check_gcc_version + if ver_test ${KFMIN} -ge 6.9.0; then + eqawarn "QA notice: ${FUNCNAME} has become a no-op." + eqawarn "It is longer being exported with KFMIN >=6.9.0." + if [[ -v ${KDE_GCC_MINIMAL} ]]; then + eqawarn "QA notice: KDE_GCC_MINIMAL has been removed and is a no-op." + fi + else + _ecm_check_gcc_version + fi } # @FUNCTION: ecm_src_prepare @@ -802,11 +817,10 @@ ecm_pkg_postrm() { fi if ver_test ${KFMIN} -lt 6.9.0; then - EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm -fi - -if [[ -v ${KDE_GCC_MINIMAL} ]]; then - EXPORT_FUNCTIONS pkg_pretend + EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst pkg_postrm + if [[ -v ${KDE_GCC_MINIMAL} ]]; then + EXPORT_FUNCTIONS pkg_pretend + fi fi -EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test src_install +EXPORT_FUNCTIONS src_prepare src_configure src_test src_install