configure: Add flags for MinGW32 standalone build
PATCH 1/1 configure: Add flags for MinGW32 standalone build
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.
Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
--- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
configure +7 -1
@@ -358,6 +358,7 @@ strip_opt="yes" tcg_interpreter="no" bigendian="no" mingw32="no" +mingw32_standalone="yes" gcov="no" EXESUF="$default_feature" HOST_DSOSUF=".so"
@@ -1558,6 +1559,10 @@ for opt do ;; --disable-fuse-lseek) fuse_lseek="disabled" ;; + --enable-standalone-mingw) mingw32_standalone="yes" + ;; + --disable-standalone-mingw) mingw32_standalone="no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"
@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}" libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" -if test "$mingw32" = "yes" ; then +if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then mandir="$prefix" datadir="$prefix" docdir="$prefix"
@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default is enabled if available libdaxctl libdaxctl support fuse FUSE block device export fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW NOTE: The object files are built at the place where configure is launched EOF
Signature · 1 line
2.30.0
Quoted 55 lines · Joshua Watt
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>--- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)configure +6
-1@@ -358,6 +358,7 @@ strip_opt="yes" tcg_interpreter="no" bigendian="no" mingw32="no" +mingw32_standalone="yes" gcov="no" EXESUF="$default_feature" HOST_DSOSUF=".so"@@ -1558,6 +1559,10 @@ for opt do ;; --disable-fuse-lseek) fuse_lseek="disabled" ;; + --enable-standalone-mingw) mingw32_standalone="yes" + ;; + --disable-standalone-mingw) mingw32_standalone="no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}" libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" -if test "$mingw32" = "yes" ; then +if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then mandir="$prefix" datadir="$prefix" docdir="$prefix"
configure disabled with --disable-FEATURE, default is enabled if available · line 1908
Quoted 7 lines
configure +1
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default is enabled if available libdaxctl libdaxctl support fuse FUSE block device export fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW NOTE: The object files are built at the place where configure is launched EOF
I think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
Thomas
Quoted 56 lines · Thomas Huth
Quoted 55 lines · Joshua Watt
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>---
configure | 8 +++++++-1 file changed, 7 insertions(+), 1 deletion(-)configure +0
-0@@ -358,6 +358,7 @@ strip_opt="yes"tcg_interpreter="no"
bigendian="no"
mingw32="no"
+mingw32_standalone="yes"
gcov="no"
EXESUF="$default_feature"
HOST_DSOSUF=".so"configure +0
-0@@ -1558,6 +1559,10 @@ for opt do ;;--disable-fuse-lseek) fuse_lseek="disabled" ;;
+ --enable-standalone-mingw) mingw32_standalone="yes" + ;;
+ --disable-standalone-mingw) mingw32_standalone="no" + ;;
*)
echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"configure +0
-0@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}"libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}"
-if test "$mingw32" = "yes" ; then
+if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then mandir="$prefix"
datadir="$prefix"
docdir="$prefix"configure +0
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default isenabled if available
Quoted 8 lines
Quoted 6 lines
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW
NOTE: The object files are built at the place where configure is launched EOFI think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
We could, but I'm curious how useful that is? Does that make the option just a shorthand for "--mandir=$prefix --bindir=$prefix --datadir=$prefix etc..." for all builds?
Quoted 3 lines
Thomas
Quoted 67 lines · Joshua Watt
Quoted 56 lines · Thomas Huth
Quoted 55 lines · Joshua Watt
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>---
configure | 8 +++++++-1 file changed, 7 insertions(+), 1 deletion(-)configure +0
-0@@ -358,6 +358,7 @@ strip_opt="yes"tcg_interpreter="no"
bigendian="no"
mingw32="no"
+mingw32_standalone="yes"
gcov="no"
EXESUF="$default_feature"
HOST_DSOSUF=".so"configure +0
-0@@ -1558,6 +1559,10 @@ for opt do ;;--disable-fuse-lseek) fuse_lseek="disabled" ;;
+ --enable-standalone-mingw) mingw32_standalone="yes" + ;;
+ --disable-standalone-mingw) mingw32_standalone="no" + ;;
*)
echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"configure +0
-0@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}"libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}"
-if test "$mingw32" = "yes" ; then
+if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then mandir="$prefix"
datadir="$prefix"
docdir="$prefix"configure +0
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default is enabledif available
Quoted 8 lines
Quoted 6 lines
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW
NOTE: The object files are built at the place where configure is launched EOFI think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
Quoted 1 line
We could, but I'm curious how useful that is? Does that make the option just a shorthand for "--mandir=$prefix --bindir=$prefix --datadir=$prefix etc..." for all builds?
Yes, that would basically be a shorthand for that. Could be useful for people who want to create standalone binaries on Linux etc., too.
Thomas
Am 11.01.21 um 08:04 schrieb Thomas Huth:
Quoted 69 lines · Joshua Watt
Quoted 68 lines · Thomas Huth
Quoted 65 lines · Joshua Watt
Quoted 55 lines
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>---
configure | 8 +++++++-1 file changed, 7 insertions(+), 1 deletion(-)configure +0
-0@@ -358,6 +358,7 @@ strip_opt="yes"tcg_interpreter="no"
bigendian="no"
mingw32="no"
+mingw32_standalone="yes"
gcov="no"
EXESUF="$default_feature"
HOST_DSOSUF=".so"configure +0
-0@@ -1558,6 +1559,10 @@ for opt do ;;--disable-fuse-lseek) fuse_lseek="disabled" ;;
+ --enable-standalone-mingw) mingw32_standalone="yes" + ;;
+ --disable-standalone-mingw) mingw32_standalone="no" + ;;
*)
echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"configure +0
-0@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}"libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}"
-if test "$mingw32" = "yes" ; then
+if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then
mandir="$prefix"
datadir="$prefix"
docdir="$prefix"configure +0
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default isQuoted 7 lines
enabled if available
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW
NOTE: The object files are built at the place where configure is launched EOFI think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
Quoted 6 lines
Quoted 2 lines
We could, but I'm curious how useful that is? Does that make the option just a shorthand for "--mandir=$prefix --bindir=$prefix --datadir=$prefix etc..." for all builds?
Yes, that would basically be a shorthand for that. Could be useful for people who want to create standalone binaries on Linux etc., too.
Thomas
Aren't nearly all files already rooted in $prefix? The only exception I know is /etc/qemu.
Rooting in $prefix still allows hierarchical subdirectories. I'd prefer them for MinGW, too.
Stefan
Quoted 74 lines · Stefan Weil
Am 11.01.21 um 08:04 schrieb Thomas Huth:
Quoted 72 lines · Joshua Watt
Quoted 70 lines · Thomas Huth
Quoted 57 lines · Joshua Watt
Quoted 56 lines
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>---
configure | 8 +++++++-1 file changed, 7 insertions(+), 1 deletion(-)configure +0
-0@@ -358,6 +358,7 @@ strip_opt="yes"tcg_interpreter="no"
bigendian="no"
mingw32="no"
+mingw32_standalone="yes"
gcov="no"
EXESUF="$default_feature"
HOST_DSOSUF=".so"configure +0
-0@@ -1558,6 +1559,10 @@ for opt do ;;--disable-fuse-lseek) fuse_lseek="disabled" ;;
+ --enable-standalone-mingw) mingw32_standalone="yes" + ;;
+ --disable-standalone-mingw) mingw32_standalone="no" + ;;
*)
echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"configure +0
-0@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}"libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}"
-if test "$mingw32" = "yes" ; then
+if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes"; then
mandir="$prefix"
datadir="$prefix"
docdir="$prefix"configure +0
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default isenabled if available
Quoted 8 lines
Quoted 6 lines
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports + standalone-mingw Build for standalone distribution on MinGW
NOTE: The object files are built at the place where configure is launched EOFI think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
We could, but I'm curious how useful that is? Does that make the option just a shorthand for "--mandir=$prefix --bindir=$prefix --datadir=$prefix etc..." for all builds?
Quoted 8 lines
Quoted 3 lines
Yes, that would basically be a shorthand for that. Could be useful for people who want to create standalone binaries on Linux etc., too.
Thomas
Aren't nearly all files already rooted in $prefix? The only exception I know is
/etc/qemu.Rooting in $prefix still allows hierarchical subdirectories. I'd prefer them for MinGW, too.
I agree, it was an issue before 5.2 but now we have relocatable installations. So it would be better to remove all the special casing of mingw, except that (for backwards compatibility) on mingw bindir defaults to $prefix instead of $prefix/bin. Then Joshua's usecase is covered simply by --bindir=/mingw/bin.
Paolo
Quoted 94 lines · Paolo Bonzini
Quoted 92 lines · Stefan Weil
Am 11.01.21 um 08:04 schrieb Thomas Huth:
Quoted 77 lines · Joshua Watt
Quoted 76 lines · Thomas Huth
Quoted 73 lines · Joshua Watt
Quoted 58 lines
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the
QEMU
website. In this case, all of the QEMU files should be rooted in $prefix to ensure they can be easily packaged together for distribution
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they
for a
Linux build.Add a configure time flags --enable-standalone-mingw and --disable-standalone-mingw that allows the user to control this behavior. The flag defaults to "enabled" if unspecified to retain the existing build behavior
Signed-off-by Joshua Watt <[email protected]>--- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)configure +6
-0@@ -358,6 +358,7 @@ strip_opt="yes" tcg_interpreter="no" bigendian="no" mingw32="no" +mingw32_standalone="yes" gcov="no" EXESUF="$default_feature" HOST_DSOSUF=".so"@@ -1558,6 +1559,10 @@ for opt do ;; --disable-fuse-lseek) fuse_lseek="disabled" ;; + --enable-standalone-mingw) mingw32_standalone="yes" + ;; + --disable-standalone-mingw) mingw32_standalone="no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information"@@ -1570,7 +1575,7 @@ libdir="${libdir:-$prefix/lib}" libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" -if test "$mingw32" = "yes" ; then +if test "$mingw32" = "yes" && test "$mingw32_standalone" = "yes";then
mandir="$prefix"
datadir="$prefix"
docdir="$prefix"configure +0
-0@@ -1897,6 +1902,7 @@ disabled with --disable-FEATURE, default isenabled if available
Quoted 7 lines
libdaxctl libdaxctl support fuse FUSE block device export fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports+ standalone-mingw Build for standalone distribution on MinGW
NOTE: The object files are built at the place where configure
is launched
EOFI think this should maybe be done independently from MinGW, so that it could be used on other systems, too. Thus maybe rather name the switch "--enable-standalone-distribution" or "--enable-standalone-installation" or something like this? On MinGW, the value of the switch could then default to "yes" while on other systems it would be "no" by default.
Quoted 8 lines
Quoted 3 lines
We could, but I'm curious how useful that is? Does that make the option just a shorthand for "--mandir=$prefix --bindir=$prefix --datadir=$prefix etc..." for all builds?
Yes, that would basically be a shorthand for that. Could be useful for people who want to create standalone binaries on Linux etc., too.
Thomas
Aren't nearly all files already rooted in $prefix? The only exception I know is
/etc/qemu.
Quoted 8 lines
Quoted 2 lines
Rooting in $prefix still allows hierarchical subdirectories. I'd prefer them for MinGW, too.
I agree, it was an issue before 5.2 but now we have relocatable installations. So it would be better to remove all the special casing of mingw, except that (for backwards compatibility) on mingw bindir defaults to $prefix instead of $prefix/bin. Then Joshua's usecase is covered simply by --bindir=/mingw/bin.
Right. Removing the special case for MinGW would solve my problem and be fine with me; the thing I don't know is if we need to preserve the backward compatibility of forcing a specific "flat" layout in $prefix when building for MinGW. There are basically 2 options I can see:
1) Add a flag to default MinGW to the "flat" layout, but allow it to
be overridden so that it can follow a normal layout (e.g. --bindir, etc. are respected). This what my patch adds
2) Remove the special casing for MinGW entirely. A "flat" layout
would still be possible by doing e.g. "--bindir=$prefix --datadir=$prefix ..." manually but it would no longer be the default.
I'm fine with either option, but I'm not familiar enough with the project to be able to know which is better.
Quoted 3 lines
Paolo
Quoted 16 lines · Joshua Watt
Quoted 5 lines
I agree, it was an issue before 5.2 but now we have relocatable installations. So it would be better to remove all the special casing of mingw, except that (for backwards compatibility) on mingw bindir defaults to $prefix instead of $prefix/bin. Then Joshua's usecase is covered simply by --bindir=/mingw/bin.
Right. Removing the special case for MinGW would solve my problem and be fine with me; the thing I don't know is if we need to preserve the backward compatibility of forcing a specific "flat" layout in $prefix when building for MinGW. There are basically 2 options I can see:
1) Add a flag to default MinGW to the "flat" layout, but allow it to
be overridden so that it can follow a normal layout (e.g. --bindir, etc. are respected). This what my patch adds
2) Remove the special casing for MinGW entirely. A "flat" layout
would still be possible by doing e.g. "--bindir=$prefix --datadir=$prefix ..." manually but it would no longer be the default.
Quoted 2 lines
I'm fine with either option, but I'm not familiar enough with the project to be able to know which is better.
I think it's okay if you remove the special case _almost_ entirely. That is, MinGW would still default to --bindir=$prefix (and that would be the only "flattened" directory), but it would be possible to override it for your use case.
Paolo
PATCH v2 1/1 configure: MinGW respect --bindir argument
In reply to Joshua WattThere are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all the QEMU executable files should be rooted in $prefix to ensure they can be easily found by the user
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.
Restructures the MinGW path configuration so that all of the paths except bindir use the same rules as when building for other platforms. This satisfies #2 and #1 since these files do not need to be directly in $prefix anyway.
The handling for --bindir is changed so that it defaults to $prefix on MinGW (maintaining the compatibility with #1), but if the user specifies a specific path when configuring it can also satisfy #2.
--- configure | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
configure +6 -11
@@ -1571,20 +1571,15 @@ libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" if test "$mingw32" = "yes" ; then - mandir="$prefix" - datadir="$prefix" - docdir="$prefix" - bindir="$prefix" - sysconfdir="$prefix" - local_statedir="$prefix" + bindir="${bindir:-$prefix}" else - mandir="${mandir:-$prefix/share/man}" - datadir="${datadir:-$prefix/share}" - docdir="${docdir:-$prefix/share/doc}" bindir="${bindir:-$prefix/bin}" - sysconfdir="${sysconfdir:-$prefix/etc}" - local_statedir="${local_statedir:-$prefix/var}" fi +mandir="${mandir:-$prefix/share/man}" +datadir="${datadir:-$prefix/share}" +docdir="${docdir:-$prefix/share/doc}" +sysconfdir="${sysconfdir:-$prefix/etc}" +local_statedir="${local_statedir:-$prefix/var}" firmwarepath="${firmwarepath:-$datadir/qemu-firmware}" localedir="${localedir:-$datadir/locale}"
Signature · 1 line
2.30.0
Re: [PATCH v2] configure: MinGW respect --bindir argument
Quoted 45 lines · Joshua Watt
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all the QEMU executable files should be rooted in $prefix to ensure they can be easily found by the user
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Restructures the MinGW path configuration so that all of the paths except bindir use the same rules as when building for other platforms. This satisfies #2 and #1 since these files do not need to be directly in $prefix anyway.
The handling for --bindir is changed so that it defaults to $prefix on MinGW (maintaining the compatibility with #1), but if the user specifies a specific path when configuring it can also satisfy #2.
Signed-off-by Joshua Watt <[email protected]>--- configure | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)configure +1
-9@@ -1571,20 +1571,15 @@ libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" if test "$mingw32" = "yes" ; then - mandir="$prefix" - datadir="$prefix" - docdir="$prefix" - bindir="$prefix" - sysconfdir="$prefix" - local_statedir="$prefix" + bindir="${bindir:-$prefix}" else - mandir="${mandir:-$prefix/share/man}" - datadir="${datadir:-$prefix/share}" - docdir="${docdir:-$prefix/share/doc}" bindir="${bindir:-$prefix/bin}"
configure libexecdir="${libexecdir:-$prefix/libexec}" · line 1584
Quoted 10 lines
configure +5
-2- sysconfdir="${sysconfdir:-$prefix/etc}" - local_statedir="${local_statedir:-$prefix/var}" fi +mandir="${mandir:-$prefix/share/man}" +datadir="${datadir:-$prefix/share}" +docdir="${docdir:-$prefix/share/doc}" +sysconfdir="${sysconfdir:-$prefix/etc}" +local_statedir="${local_statedir:-$prefix/var}" firmwarepath="${firmwarepath:-$datadir/qemu-firmware}" localedir="${localedir:-$datadir/locale}"
Yes, I think this makes most sense, thanks for the update!
Paolo Bonzini
AppliedRe: [PATCH v2] configure: MinGW respect --bindir argument
In reply to Joshua WattQuoted 47 lines · Joshua Watt
There are two cases that need to be accounted for when compiling QEMU for MinGW32:
1) A standalone distribution, where QEMU is self contained and extracted by the user, such as a user would download from the QEMU website. In this case, all the QEMU executable files should be rooted in $prefix to ensure they can be easily found by the user
2) QEMU integrated into a distribution image/sysroot/SDK and distributed with other programs. In this case, the provided arguments for bindir/datadir/etc. should be respected as they for a Linux build.Restructures the MinGW path configuration so that all of the paths except bindir use the same rules as when building for other platforms. This satisfies #2 and #1 since these files do not need to be directly in $prefix anyway.
The handling for --bindir is changed so that it defaults to $prefix on MinGW (maintaining the compatibility with #1), but if the user specifies a specific path when configuring it can also satisfy #2.
Signed-off-by Joshua Watt <[email protected]>--- configure | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)configure +1
-10@@ -1571,20 +1571,15 @@ libexecdir="${libexecdir:-$prefix/libexec}" includedir="${includedir:-$prefix/include}" if test "$mingw32" = "yes" ; then - mandir="$prefix" - datadir="$prefix" - docdir="$prefix" - bindir="$prefix" - sysconfdir="$prefix" - local_statedir="$prefix" + bindir="${bindir:-$prefix}" else - mandir="${mandir:-$prefix/share/man}" - datadir="${datadir:-$prefix/share}" - docdir="${docdir:-$prefix/share/doc}" bindir="${bindir:-$prefix/bin}" - sysconfdir="${sysconfdir:-$prefix/etc}"
configure libexecdir="${libexecdir:-$prefix/libexec}" · line 1585
Quoted 10 lines
configure +5
-1- local_statedir="${local_statedir:-$prefix/var}" fi +mandir="${mandir:-$prefix/share/man}" +datadir="${datadir:-$prefix/share}" +docdir="${docdir:-$prefix/share/doc}" +sysconfdir="${sysconfdir:-$prefix/etc}" +local_statedir="${local_statedir:-$prefix/var}" firmwarepath="${firmwarepath:-$datadir/qemu-firmware}" localedir="${localedir:-$datadir/locale}"
Queued, thanks!
Paolo