From 0fc8f07750b82b55d262adb3df8ce83723d1376e Mon Sep 17 00:00:00 2001 From: Jaredy899 <76603258+Jaredy899@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:15:41 -0500 Subject: [PATCH] fix(compile-setup): dnf compile (#1028) * fix compile for fedora, rocky, old fedoras * Update compile-setup.sh * Update compile-setup.sh * Update compile-setup.sh * Update compile-setup.sh * Update core/tabs/system-setup/compile-setup.sh Co-authored-by: Adam Perkowski * Update core/tabs/system-setup/compile-setup.sh Co-authored-by: Adam Perkowski * Update compile-setup.sh --------- Co-authored-by: Adam Perkowski --- core/tabs/system-setup/compile-setup.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh index 746d1d5f..234460e1 100755 --- a/core/tabs/system-setup/compile-setup.sh +++ b/core/tabs/system-setup/compile-setup.sh @@ -25,11 +25,16 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" ;; dnf) - COMPILEDEPS='@development-tools' - "$ESCALATION_TOOL" "$PACKAGER" update - "$ESCALATION_TOOL" "$PACKAGER" config-manager --set-enabled powertools - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$COMPILEDEPS" - "$ESCALATION_TOOL" "$PACKAGER" install -y glibc-devel.i686 libgcc.i686 + "$ESCALATION_TOOL" "$PACKAGER" update -y + if ! "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable powertools 2>/dev/null; then + "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable crb 2>/dev/null || true + fi + # shellcheck disable=SC2086 + "$ESCALATION_TOOL" "$PACKAGER" -y install $DEPENDENCIES + if ! "$ESCALATION_TOOL" "$PACKAGER" -y group install "Development Tools" 2>/dev/null; then + "$ESCALATION_TOOL" "$PACKAGER" -y group install development-tools + fi + "$ESCALATION_TOOL" "$PACKAGER" -y install glibc-devel.i686 libgcc.i686 ;; zypper) COMPILEDEPS='patterns-devel-base-devel_basis'