From 72409c32be53d7d4ffce0725ad0fa4754495a2c7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 8 Dec 2023 14:20:50 +0100
Subject: [PATCH] configure: Disable building programs for ARM64EC.

Explicitly enable the few programs that need it.
---
 aclocal.m4   |  7 ++++++-
 configure    | 16 +++++++++++++++-
 configure.ac | 10 ++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 5f1e7bbdbf3..f9049a44550 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -301,6 +301,7 @@ wine_fn_config_makefile ()
     AS_VAR_COPY([enable],[$[2]])
     case "$enable" in
       no) AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"]) ;;
+      yes) ;;
       *aarch64*|*arm*|*i386*|*x86_64*)
         if test -n "$PE_ARCHS"
         then
@@ -310,7 +311,11 @@ wine_fn_config_makefile ()
             done
         else
             test $(expr ",$enable," : ".*,$HOST_ARCH,") -gt 0 || AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"])
-        fi;;
+        fi ;;
+      "")
+        case "$[1], $PE_ARCHS " in
+          programs/*,*\ arm64ec\ *) AS_VAR_APPEND([arm64ec_DISABLED_SUBDIRS],[" $[1]"]) ;;
+        esac ;;
     esac
 }
 
diff --git a/configure b/configure
index 644d38e7288..d225fa226a6 100755
--- a/configure
+++ b/configure
@@ -6431,6 +6431,15 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
 enable_wow64cpu=${enable_wow64cpu:-x86_64}
 enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec}
 
+enable_cmd=${enable_cmd:-yes}
+enable_dllhost=${enable_dllhost:-yes}
+enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec}
+enable_dxdiag=${enable_dxdiag:-yes}
+enable_msiexec=${enable_msiexec:-yes}
+enable_netsh=${enable_netsh:-yes}
+enable_regsvr32=${enable_regsvr32:-yes}
+enable_rundll32=${enable_rundll32:-yes}
+
 enable_winetest=${enable_winetest:-$enable_tests}
 
 if test "x$enable_win64" = "xyes"
@@ -9438,6 +9447,7 @@ wine_fn_config_makefile ()
     eval enable=\$$2
     case "$enable" in
       no) as_fn_append DISABLED_SUBDIRS " $1" ;;
+      yes) ;;
       *aarch64*|*arm*|*i386*|*x86_64*)
         if test -n "$PE_ARCHS"
         then
@@ -9447,7 +9457,11 @@ wine_fn_config_makefile ()
             done
         else
             test $(expr ",$enable," : ".*,$HOST_ARCH,") -gt 0 || as_fn_append DISABLED_SUBDIRS " $1"
-        fi;;
+        fi ;;
+      "")
+        case "$1, $PE_ARCHS " in
+          programs/*,*\ arm64ec\ *) as_fn_append arm64ec_DISABLED_SUBDIRS " $1" ;;
+        esac ;;
     esac
 }
 
diff --git a/configure.ac b/configure.ac
index 078856efe6f..a8bb26a5092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,16 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
 enable_wow64cpu=${enable_wow64cpu:-x86_64}
 enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec}
 
+dnl Explicitly enable some programs for arm64ec
+enable_cmd=${enable_cmd:-yes}
+enable_dllhost=${enable_dllhost:-yes}
+enable_dpnsvr=${enable_dpnsvr:-i386,x86_64,arm64ec}
+enable_dxdiag=${enable_dxdiag:-yes}
+enable_msiexec=${enable_msiexec:-yes}
+enable_netsh=${enable_netsh:-yes}
+enable_regsvr32=${enable_regsvr32:-yes}
+enable_rundll32=${enable_rundll32:-yes}
+
 dnl Disable winetest too if tests are disabled
 enable_winetest=${enable_winetest:-$enable_tests}