zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Disable building programs for ARM64EC.

Browse source 
Explicitly enable the few programs that need it.
This commit is contained in:
Alexandre Julliard 2023-12-08 14:20:50 +01:00
parent 8e1197c92e
commit 72409c32be
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aclocal.m4 vendored
View file

@ -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
}

16
configure vendored
View file

@ -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
}

10
configure.ac
View file

@ -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}