Skip to content

Commit 79cf7dd

Browse files
authored
Fix install on Fedora 42
1 parent f3e0204 commit 79cf7dd

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.devcontainer/onCreate-meson.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ SYSTEM=$(build/bin/sage-guess-package-system)
44

55
if [ "$SYSTEM" = "fedora" ]; then
66
# Need to use --setopt=tsflags="" to avoid errors with gphelp
7-
yum install -y pari-gp --setopt=tsflags=""
7+
dnf5 install -y pari-gp --setopt=tsflags=""
8+
9+
# Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
10+
# by swapping the incorrectly installed OpenCL-ICD-Loader for the expected ocl-icd
11+
dnf5 -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
812
fi
913

1014
eval $(build/bin/sage-print-system-package-command $SYSTEM "$@" update)

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ jobs:
4444
SYSTEM=$(build/bin/sage-guess-package-system)
4545
if [ "$SYSTEM" = "fedora" ]; then
4646
# Need to use --setopt=tsflags="" to avoid errors with gphelp
47-
yum install -y pari-gp --setopt=tsflags=""
47+
dnf5 install -y pari-gp --setopt=tsflags=""
48+
49+
# Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
50+
# by swapping the incorrectly installed OpenCL-ICD-Loader for the expected ocl-icd
51+
dnf5 -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
4852
fi
4953
5054
eval $(build/bin/sage-print-system-package-command $SYSTEM update)

build/bin/sage-guess-package-system

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ elif emerge --version > /dev/null 2>&1; then
1717
echo gentoo
1818
elif apt-get --version > /dev/null 2>&1; then
1919
echo debian
20-
elif yum --version > /dev/null 2>&1; then
20+
elif dnf5 --version > /dev/null 2>&1; then
2121
echo fedora
2222
elif pacman --version > /dev/null 2>&1; then
2323
echo arch

build/bin/sage-print-system-package-command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ case $system:$command in
154154
@(fedora*|redhat*|centos*):install)
155155
[ "$YES" = yes ] && options="$options -y"
156156
[ "$IGNORE_MISSING" = yes ] && options="$options --skip-unavailable"
157-
[ -n "$system_packages" ] && print_shell_command ${SUDO}yum install $options $system_packages
157+
[ -n "$system_packages" ] && print_shell_command ${SUDO}dnf5 install $options $system_packages
158158
;;
159159
gentoo*:install)
160160
[ -n "$system_packages" ] && print_shell_command ${SUDO}emerge $system_packages

0 commit comments

Comments
 (0)