* [PATCH 2/4] meson: fixes relpath may fail on win32. On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2
2020-08-25 14:49 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ luoyonggang
@ 2020-08-25 14:49 ` luoyonggang
2020-08-25 14:49 ` [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: luoyonggang @ 2020-08-25 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Yonggang Luo
From: Yonggang Luo <luoyonggang@gmail.com>
---
scripts/mtest2make.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index bdb257bbd9..d7a51bf97e 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -53,9 +53,16 @@ i = 0
for test in json.load(sys.stdin):
env = ' '.join(('%s=%s' % (shlex.quote(k), shlex.quote(v))
for k, v in test['env'].items()))
- executable = os.path.relpath(test['cmd'][0])
+ executable = test['cmd'][0]
+ try:
+ executable = os.path.relpath(executable)
+ except:
+ pass
if test['workdir'] is not None:
- test['cmd'][0] = os.path.relpath(test['cmd'][0], test['workdir'])
+ try:
+ test['cmd'][0] = os.path.relpath(executable, test['workdir'])
+ except:
+ test['cmd'][0] = executable
else:
test['cmd'][0] = executable
cmd = '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in test['cmd'])))
--
2.27.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2
2020-08-25 14:49 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ luoyonggang
2020-08-25 14:49 ` [PATCH 2/4] meson: fixes relpath may fail on win32. On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2 luoyonggang
@ 2020-08-25 14:49 ` luoyonggang
2020-08-25 14:49 ` [PATCH 4/4] configure: Fix include and linkage issue on msys2 On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Case $PWD are result msys type path such as /e/path/to/qemu but `pwd -W` are result E:/path/to/qemu that can be recognized by the compiler So we replace all $PWD with $build_path that can handling msys2/mingw properly luoyonggang
2020-08-26 7:28 ` [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ Markus Armbruster
3 siblings, 0 replies; 5+ messages in thread
From: luoyonggang @ 2020-08-25 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Yonggang Luo
From: Yonggang Luo <luoyonggang@gmail.com>
---
meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index df5bf728b5..a3585881e1 100644
--- a/meson.build
+++ b/meson.build
@@ -224,8 +224,7 @@ if 'CONFIG_BRLAPI' in config_host
brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
endif
-sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static,
- include_type: 'system')
+sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static)
sdl_image = not_found
if sdl.found()
# work around 2.0.8 bug
--
2.27.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] configure: Fix include and linkage issue on msys2 On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Case $PWD are result msys type path such as /e/path/to/qemu but `pwd -W` are result E:/path/to/qemu that can be recognized by the compiler So we replace all $PWD with $build_path that can handling msys2/mingw properly
2020-08-25 14:49 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ luoyonggang
2020-08-25 14:49 ` [PATCH 2/4] meson: fixes relpath may fail on win32. On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2 luoyonggang
2020-08-25 14:49 ` [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
@ 2020-08-25 14:49 ` luoyonggang
2020-08-26 7:28 ` [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ Markus Armbruster
3 siblings, 0 replies; 5+ messages in thread
From: luoyonggang @ 2020-08-25 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Yonggang Luo
From: Yonggang Luo <luoyonggang@gmail.com>
---
configure | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index b8f5b81a67..a0e2b20877 100755
--- a/configure
+++ b/configure
@@ -13,8 +13,13 @@ export CCACHE_RECACHE=yes
# make source path absolute
source_path=$(cd "$(dirname -- "$0")"; pwd)
+build_path=$PWD
+if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then
+source_path=$(cd "$(dirname -- "$0")"; pwd -W)
+build_path=`pwd -W`
+fi
-if test "$PWD" = "$source_path"
+if test "$build_path" = "$source_path"
then
echo "Using './build' as the directory for build output"
@@ -346,7 +351,12 @@ ld_has() {
$ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1
}
-if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]";
+check_valid_build_path="[[:space:]:]"
+if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then
+check_valid_build_path="[[:space:]]"
+fi
+
+if printf %s\\n "$source_path" "$build_path" | grep -q "$check_valid_build_path";
then
error_exit "main directory cannot contain spaces nor colons"
fi
@@ -942,7 +952,7 @@ Linux)
linux="yes"
linux_user="yes"
kvm="yes"
- QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES"
+ QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I${build_path}/linux-headers $QEMU_INCLUDES"
libudev="yes"
;;
esac
@@ -4299,7 +4309,7 @@ EOF
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
fi
fdt_cflags="-I${source_path}/dtc/libfdt"
- fdt_ldflags="-L$PWD/dtc/libfdt"
+ fdt_ldflags="-L${build_path}/dtc/libfdt"
fdt_libs="$fdt_libs"
elif test "$fdt" = "yes" ; then
# Not a git build & no libfdt found, prompt for system install
@@ -5284,7 +5294,7 @@ case "$capstone" in
else
LIBCAPSTONE=libcapstone.a
fi
- capstone_libs="-L$PWD/capstone -lcapstone"
+ capstone_libs="-L${build_path}/capstone -lcapstone"
capstone_cflags="-I${source_path}/capstone/include"
;;
@@ -6284,8 +6294,8 @@ case "$slirp" in
git_submodules="${git_submodules} slirp"
fi
mkdir -p slirp
- slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src"
- slirp_libs="-L$PWD/slirp -lslirp"
+ slirp_cflags="-I${source_path}/slirp/src -I${build_path}/slirp/src"
+ slirp_libs="-L${build_path}/slirp -lslirp"
if test "$mingw32" = "yes" ; then
slirp_libs="$slirp_libs -lws2_32 -liphlpapi"
fi
@@ -8233,7 +8243,7 @@ fi
mv $cross config-meson.cross
rm -rf meson-private meson-info meson-logs
-NINJA=$PWD/ninjatool $meson setup \
+NINJA="${build_path}/ninjatool" $meson setup \
--prefix "${pre_prefix}$prefix" \
--libdir "${pre_prefix}$libdir" \
--libexecdir "${pre_prefix}$libexecdir" \
@@ -8249,11 +8259,11 @@ NINJA=$PWD/ninjatool $meson setup \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
- -Dsdl=$sdl -Dsdl_image=$sdl_image \
- -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
- -Dgettext=$gettext \
+ -Dsdl=$sdl -Dsdl_image=$sdl_image \
+ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
+ -Dgettext=$gettext \
$cross_arg \
- "$PWD" "$source_path"
+ "$build_path" "$source_path"
if test "$?" -ne 0 ; then
error_exit "meson setup failed"
--
2.27.0.windows.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/
2020-08-25 14:49 [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ luoyonggang
` (2 preceding siblings ...)
2020-08-25 14:49 ` [PATCH 4/4] configure: Fix include and linkage issue on msys2 On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Case $PWD are result msys type path such as /e/path/to/qemu but `pwd -W` are result E:/path/to/qemu that can be recognized by the compiler So we replace all $PWD with $build_path that can handling msys2/mingw properly luoyonggang
@ 2020-08-26 7:28 ` Markus Armbruster
3 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2020-08-26 7:28 UTC (permalink / raw)
To: luoyonggang; +Cc: Paolo Bonzini, qemu-devel
Please do not put all of your commit message in the subject line.
https://wiki.qemu.org/Contribute/SubmitAPatch#Write_a_meaningful_commit_message
https://chris.beams.io/posts/git-commit/
^ permalink raw reply [flat|nested] 5+ messages in thread