Merge pull request openscad#5539 from bdwheele/fedora41-build-fixes

Fix check-dependencies.sh on Fedora 41
bneuen · Dec 28, 2024 · 5cb4ccf · 5cb4ccf
2 parents 6838392 + 806eb48
commit 5cb4ccf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
@@ -180,6 +180,10 @@ gmp_sysver()
 
 qt_sysver()
 {
+  if [ -d '/usr/lib/qtchooser' ]; then
+    . <(/usr/lib/qtchooser/qtchooser -print-env)
+    PATH=$PATH:$QTTOOLDIR
+  fi
   if [ "`command -v qtchooser`" ]; then
     qtver=`qtchooser -run-tool=qmake -qt=5 -v 2>&1`
     if [ $? -eq 0 ] ; then

diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
@@ -26,6 +26,7 @@ get_fedora_deps_dnf()
  dnf -y install libxml2-devel
  dnf -y install libffi-devel
  dnf -y install redhat-rpm-config
+ dnf -y install qtchooser
 }
 
 get_qomo_deps()