Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
72409c32
Commit
72409c32
authored
Dec 08, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Disable building programs for ARM64EC.
Explicitly enable the few programs that need it.
parent
8e1197c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
2 deletions
+31
-2
aclocal.m4
aclocal.m4
+6
-1
configure
configure
+15
-1
configure.ac
configure.ac
+10
-0
No files found.
aclocal.m4
View file @
72409c32
...
@@ -301,6 +301,7 @@ wine_fn_config_makefile ()
...
@@ -301,6 +301,7 @@ wine_fn_config_makefile ()
AS_VAR_COPY([enable],[$[2]])
AS_VAR_COPY([enable],[$[2]])
case "$enable" in
case "$enable" in
no) AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"]) ;;
no) AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"]) ;;
yes) ;;
*aarch64*|*arm*|*i386*|*x86_64*)
*aarch64*|*arm*|*i386*|*x86_64*)
if test -n "$PE_ARCHS"
if test -n "$PE_ARCHS"
then
then
...
@@ -310,7 +311,11 @@ wine_fn_config_makefile ()
...
@@ -310,7 +311,11 @@ wine_fn_config_makefile ()
done
done
else
else
test $(expr ",$enable," : ".*,$HOST_ARCH,") -gt 0 || AS_VAR_APPEND([DISABLED_SUBDIRS],[" $[1]"])
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
esac
}
}
...
...
configure
View file @
72409c32
...
@@ -6431,6 +6431,15 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
...
@@ -6431,6 +6431,15 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
enable_wow64cpu
=
${
enable_wow64cpu
:-
x86_64
}
enable_wow64cpu
=
${
enable_wow64cpu
:-
x86_64
}
enable_vcruntime140_1
=
${
enable_vcruntime140_1
:-
x86_64
,arm64ec
}
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
}
enable_winetest
=
${
enable_winetest
:-
$enable_tests
}
if
test
"x
$enable_win64
"
=
"xyes"
if
test
"x
$enable_win64
"
=
"xyes"
...
@@ -9438,6 +9447,7 @@ wine_fn_config_makefile ()
...
@@ -9438,6 +9447,7 @@ wine_fn_config_makefile ()
eval enable
=
\$
$2
eval enable
=
\$
$2
case
"
$enable
"
in
case
"
$enable
"
in
no
)
as_fn_append DISABLED_SUBDIRS
"
$1
"
;;
no
)
as_fn_append DISABLED_SUBDIRS
"
$1
"
;;
yes
)
;;
*
aarch64
*
|
*
arm
*
|
*
i386
*
|
*
x86_64
*
)
*
aarch64
*
|
*
arm
*
|
*
i386
*
|
*
x86_64
*
)
if
test
-n
"
$PE_ARCHS
"
if
test
-n
"
$PE_ARCHS
"
then
then
...
@@ -9447,7 +9457,11 @@ wine_fn_config_makefile ()
...
@@ -9447,7 +9457,11 @@ wine_fn_config_makefile ()
done
done
else
else
test
$(
expr
",
$enable
,"
:
".*,
$HOST_ARCH
,"
)
-gt
0
||
as_fn_append DISABLED_SUBDIRS
"
$1
"
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
esac
}
}
...
...
configure.ac
View file @
72409c32
...
@@ -189,6 +189,16 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
...
@@ -189,6 +189,16 @@ enable_wow64win=${enable_wow64win:-aarch64,x86_64}
enable_wow64cpu=${enable_wow64cpu:-x86_64}
enable_wow64cpu=${enable_wow64cpu:-x86_64}
enable_vcruntime140_1=${enable_vcruntime140_1:-x86_64,arm64ec}
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
dnl Disable winetest too if tests are disabled
enable_winetest=${enable_winetest:-$enable_tests}
enable_winetest=${enable_winetest:-$enable_tests}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment