Changeset 108239 in vbox

Timestamp:

Feb 16, 2025 2:45:37 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167560

Message:

Revert r167559 for now as edk2 depends on iasl (configure,Config.kmk: Drop the iasl dependency, bugref:10733)

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (5 diffs)

trunk/Config.kmk

@@ -2533 +2533 @@
 endif
 
+
+# Intel ASL compiler for ACPI
+VBOX_IASLCMD   ?= $(firstword $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/iasl$(HOSTSUFF_EXE)) iasl$(HOSTSUFF_EXE))
 
 # libxslt XSLT processor. (see PATH_TOOL_YASM for explanation why it's temporarily located in bin.)

trunk/configure

@@ -131 +131 @@
 CXX64=""
 YASM="yasm"
+IASL="iasl"
 XSLTPROC="xsltproc"
 INCCRYPTO=""
@@ -657 +658 @@
         log_success "found version $yasm_ver"
       fi
+    fi
+  fi
+}
+
+
+#
+# Check for the iasl ACPI compiler, needed to compile vbox.dsl
+#
+check_iasl()
+{
+  test_header iasl
+  if check_avail "$IASL" IASL; then
+    iasl_ver=`$IASL|grep "ASL.*version"|sed 's+^ASL.*version \([0-9]*\).*+\1+'`
+    if [ $? -ne 0 ]; then
+      log_failure "iasl not found"
+      fail
+    else
+      log_success "found version $iasl_ver"
+      cnf_append "VBOX_IASLCMD" "`which_wrapper $IASL`"
     fi
   fi
@@ -2549 +2569 @@
   --with-g++=PATH          location of the g++ compiler [$CXX]
   --with-kbuild=DIR        kbuild directory [$KBUILDDIR]
-  --with-yasm=PATH         location of the yasm compiler [$YASM]
+  --with-iasl=PATH         location of the iasl compiler [$IASL]
+  --with-yasm=PATH         location of the iasl compiler [$YASM]
   --with-makeself=PATH     location of makeself [$MAKESELF]
 EOF
@@ -2682 +2703 @@
       GSOAP_IMPORT=`echo $option | cut -d'=' -f2`
       ;;
+    --with-iasl=*)
+      IASL=`echo $option | cut -d'=' -f2`
+      ;;
     --with-yasm=*)
       YASM=`echo $option | cut -d'=' -f2`
@@ -2992 +3016 @@
 if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_open_watcom
+  [ "$OS" != "darwin"  ] && check_iasl
   [ $OSE -ge 1 ] && check_yasm
   [ "$OS" != "darwin"  ] && check_xsltproc