Skip to content

Commit

Permalink
ecm.eclass: Unexport pkg_setup w/ KFMIN >=6.9.0, drop KDE_GCC_MINIMAL
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Dec 13, 2024
1 parent bb92d53 commit bfdf4ab
Showing 1 changed file with 23 additions and 9 deletions.
32 changes: 23 additions & 9 deletions eclass/ecm.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit bfdf4ab

Please sign in to comment.