* [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail.
2020-08-25 8:34 [PATCH 1/5] meson: 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 8:34 ` luoyonggang
2020-08-25 9:04 ` Daniel P. Berrangé
2020-08-25 8:34 ` [PATCH 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: luoyonggang @ 2020-08-25 8:34 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] 12+ messages in thread* Re: [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail.
2020-08-25 8:34 ` [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail luoyonggang
@ 2020-08-25 9:04 ` Daniel P. Berrangé
0 siblings, 0 replies; 12+ messages in thread
From: Daniel P. Berrangé @ 2020-08-25 9:04 UTC (permalink / raw)
To: luoyonggang; +Cc: Paolo Bonzini, qemu-devel
Subject line is waaaaay too long here. The explanation should be
in the commit message body, not the subject.
On Tue, Aug 25, 2020 at 04:34:57PM +0800, luoyonggang@gmail.com wrote:
> 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
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2
2020-08-25 8:34 [PATCH 1/5] meson: 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 8:34 ` [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail luoyonggang
@ 2020-08-25 8:34 ` luoyonggang
2020-08-25 8:34 ` [PATCH 4/5] meson: !/bin/sh are msys2 friendly luoyonggang
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: luoyonggang @ 2020-08-25 8:34 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] 12+ messages in thread* [PATCH 4/5] meson: !/bin/sh are msys2 friendly.
2020-08-25 8:34 [PATCH 1/5] meson: 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 8:34 ` [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail luoyonggang
2020-08-25 8:34 ` [PATCH 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
@ 2020-08-25 8:34 ` luoyonggang
2020-08-25 8:59 ` Daniel P. Berrangé
2020-08-25 8:35 ` [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly luoyonggang
2020-08-25 9:05 ` [PATCH 1/5] meson: 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:/ Daniel P. Berrangé
4 siblings, 1 reply; 12+ messages in thread
From: luoyonggang @ 2020-08-25 8:34 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Yonggang Luo
From: Yonggang Luo <luoyonggang@gmail.com>
---
scripts/undefsym.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh
index b9ec332e95..8189308b2c 100755
--- a/scripts/undefsym.sh
+++ b/scripts/undefsym.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/bin/sh
# Before a shared module's DSO is produced, a static library is built for it
# and passed to this script. The script generates -Wl,-u options to force
--
2.27.0.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] meson: !/bin/sh are msys2 friendly.
2020-08-25 8:34 ` [PATCH 4/5] meson: !/bin/sh are msys2 friendly luoyonggang
@ 2020-08-25 8:59 ` Daniel P. Berrangé
2020-08-25 9:11 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Daniel P. Berrangé @ 2020-08-25 8:59 UTC (permalink / raw)
To: luoyonggang; +Cc: Paolo Bonzini, qemu-devel
On Tue, Aug 25, 2020 at 04:34:59PM +0800, luoyonggang@gmail.com wrote:
> From: Yonggang Luo <luoyonggang@gmail.com>
>
> ---
> scripts/undefsym.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh
> index b9ec332e95..8189308b2c 100755
> --- a/scripts/undefsym.sh
> +++ b/scripts/undefsym.sh
> @@ -1,4 +1,4 @@
> -#! /usr/bin/env bash
> +#!/bin/sh
Does this script actually work on non-bash shells ? If not, then this
change will likely break on plaforms where /bin/sh is not bash.
>
> # Before a shared module's DSO is produced, a static library is built for it
> # and passed to this script. The script generates -Wl,-u options to force
> --
> 2.27.0.windows.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] meson: !/bin/sh are msys2 friendly.
2020-08-25 8:59 ` Daniel P. Berrangé
@ 2020-08-25 9:11 ` 罗勇刚(Yonggang Luo)
2020-08-25 13:59 ` Eric Blake
0 siblings, 1 reply; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-08-25 9:11 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: Paolo Bonzini, qemu-level
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
Hi, works, msys2 sh compiled and run
On Tue, Aug 25, 2020 at 4:59 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:
> On Tue, Aug 25, 2020 at 04:34:59PM +0800, luoyonggang@gmail.com wrote:
> > From: Yonggang Luo <luoyonggang@gmail.com>
> >
> > ---
> > scripts/undefsym.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh
> > index b9ec332e95..8189308b2c 100755
> > --- a/scripts/undefsym.sh
> > +++ b/scripts/undefsym.sh
> > @@ -1,4 +1,4 @@
> > -#! /usr/bin/env bash
> > +#!/bin/sh
>
> Does this script actually work on non-bash shells ? If not, then this
> change will likely break on plaforms where /bin/sh is not bash.
>
> >
> > # Before a shared module's DSO is produced, a static library is built
> for it
> > # and passed to this script. The script generates -Wl,-u options to
> force
> > --
> > 2.27.0.windows.1
> >
> >
>
> Regards,
> Daniel
> --
> |: https://berrange.com -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org -o-
> https://www.instagram.com/dberrange :|
>
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 2409 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 4/5] meson: !/bin/sh are msys2 friendly.
2020-08-25 9:11 ` 罗勇刚(Yonggang Luo)
@ 2020-08-25 13:59 ` Eric Blake
2020-08-25 14:21 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Eric Blake @ 2020-08-25 13:59 UTC (permalink / raw)
To: luoyonggang, Daniel P. Berrangé; +Cc: Paolo Bonzini, qemu-level
On 8/25/20 4:11 AM, 罗勇刚(Yonggang Luo) wrote:
> Hi, works, msys2 sh compiled and run
Top-formatting makes it harder to read, compared to interleaving your
responses.
msys2 sh _is_ bash, so that's not answering the question Dan asked.
>>> +++ b/scripts/undefsym.sh
>>> @@ -1,4 +1,4 @@
>>> -#! /usr/bin/env bash
>>> +#!/bin/sh
>>
>> Does this script actually work on non-bash shells ? If not, then this
>> change will likely break on plaforms where /bin/sh is not bash.
A quick look at the script sees:
comm -12 \
<( $NM -P -g $staticlib | awk '$2!="U"{print "-Wl,-u," $1}' | sort -u) \
<( $NM -P -g "$@" | awk '$2=="U"{print "-Wl,-u," $1}' | sort -u)
<() is a bash'ism, so you _are_ breaking things on platforms like Debian
where /bin/sh is dash rather than bash.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 4/5] meson: !/bin/sh are msys2 friendly.
2020-08-25 13:59 ` Eric Blake
@ 2020-08-25 14:21 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-08-25 14:21 UTC (permalink / raw)
To: Eric Blake; +Cc: Paolo Bonzini, Daniel P. Berrangé, qemu-level
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
OK, maybe convert this to python script would be a better option.
Then skip this first
On Tue, Aug 25, 2020 at 9:59 PM Eric Blake <eblake@redhat.com> wrote:
> On 8/25/20 4:11 AM, 罗勇刚(Yonggang Luo) wrote:
> > Hi, works, msys2 sh compiled and run
>
> Top-formatting makes it harder to read, compared to interleaving your
> responses.
>
> msys2 sh _is_ bash, so that's not answering the question Dan asked.
>
>
> >>> +++ b/scripts/undefsym.sh
> >>> @@ -1,4 +1,4 @@
> >>> -#! /usr/bin/env bash
> >>> +#!/bin/sh
> >>
> >> Does this script actually work on non-bash shells ? If not, then this
> >> change will likely break on plaforms where /bin/sh is not bash.
>
> A quick look at the script sees:
>
> comm -12 \
> <( $NM -P -g $staticlib | awk '$2!="U"{print "-Wl,-u," $1}' | sort -u) \
> <( $NM -P -g "$@" | awk '$2=="U"{print "-Wl,-u," $1}' | sort -u)
>
>
> <() is a bash'ism, so you _are_ breaking things on platforms like Debian
> where /bin/sh is dash rather than bash.
>
>
> --
> Eric Blake, Principal Software Engineer
> Red Hat, Inc. +1-919-301-3226
> Virtualization: qemu.org | libvirt.org
>
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1976 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly
2020-08-25 8:34 [PATCH 1/5] meson: 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 8:34 ` [PATCH 4/5] meson: !/bin/sh are msys2 friendly luoyonggang
@ 2020-08-25 8:35 ` luoyonggang
2020-08-25 9:04 ` Daniel P. Berrangé
2020-08-25 9:05 ` [PATCH 1/5] meson: 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:/ Daniel P. Berrangé
4 siblings, 1 reply; 12+ messages in thread
From: luoyonggang @ 2020-08-25 8:35 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] 12+ messages in thread* Re: [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly
2020-08-25 8:35 ` [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly luoyonggang
@ 2020-08-25 9:04 ` Daniel P. Berrangé
0 siblings, 0 replies; 12+ messages in thread
From: Daniel P. Berrangé @ 2020-08-25 9:04 UTC (permalink / raw)
To: luoyonggang; +Cc: Paolo Bonzini, qemu-devel
On Tue, Aug 25, 2020 at 04:35:00PM +0800, luoyonggang@gmail.com wrote:
Please explain *why* the change is needed in the commit message.
ie explain what's broken with current code.
> 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`
What is the -W arg - that seems to not exist in pwd that I
see, so I guess its something msys custom.
> +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
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: 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 8:34 [PATCH 1/5] meson: 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
` (3 preceding siblings ...)
2020-08-25 8:35 ` [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly luoyonggang
@ 2020-08-25 9:05 ` Daniel P. Berrangé
4 siblings, 0 replies; 12+ messages in thread
From: Daniel P. Berrangé @ 2020-08-25 9:05 UTC (permalink / raw)
To: luoyonggang; +Cc: Paolo Bonzini, qemu-devel
Commit message subject is waaaaay too long. Put the explanation into
commit message body, not the subject line.
On Tue, Aug 25, 2020 at 04:34:56PM +0800, luoyonggang@gmail.com wrote:
> From: Yonggang Luo <luoyonggang@gmail.com>
>
> ---
> scripts/ninjatool.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
> index cc77d51aa8..6ca8be6f10 100755
> --- a/scripts/ninjatool.py
> +++ b/scripts/ninjatool.py
> @@ -55,7 +55,7 @@ else:
>
> PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}"
>
> -SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+")
> +SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$")
> IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$")
> STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.")
> TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.")
> --
> 2.27.0.windows.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 12+ messages in thread