configure: Require pixman for vhost-user-gpu.
PATCH 1/1 configure: Require pixman for vhost-user-gpu.
Use the test from Makefile to check if vhost-user-gpu is being built, and if so require pixman.
--- configure | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
configure +14 -14
@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then fi fi -########################################## -# pixman support probe - -if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=$($pkg_config --cflags pixman-1) - pixman_libs=$($pkg_config --libs pixman-1) -else - error_exit "pixman >= 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probe
@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then done fi +########################################## +# pixman support probe + +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes" ); then + pixman_cflags= + pixman_libs= +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then + pixman_cflags=$($pkg_config --cflags pixman-1) + pixman_libs=$($pkg_config --libs pixman-1) +else + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." +fi + ########################################## # libxml2 probe if test "$libxml2" != "no" ; then
Signature · 1 line
2.28.0
Quoted 2 lines · Rafael Kitover
Use the test from
Makefileto check if vhost-user-gpu is being built, and if so require pixman.
... sorry, I missed that there is indeed a tool that requires pixman.
Quoted 31 lines
Signed-off-by Rafael Kitover <[email protected]>--- configure | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)configure +0
-14@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then fi fi -########################################## -# pixman support probe - -if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=$($pkg_config --cflags pixman-1) - pixman_libs=$($pkg_config --libs pixman-1) -else - error_exit "pixman >= 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probe
configure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4483
Quoted 7 lines
configure +4
-0@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then done fi +########################################## +# pixman support probe + +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes" ); then
Do you need the round brackets here?
Quoted 4 lines
configure +3
-0+ pixman_cflags= + pixman_libs= +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
configure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4496
Quoted 10 lines
configure +7
-0+ pixman_cflags=$($pkg_config --cflags pixman-1) + pixman_libs=$($pkg_config --libs pixman-1) +else + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." +fi + ########################################## # libxml2 probe if test "$libxml2" != "no" ; then
With the round brackets removed:
Quoted 66 lines · Thomas Huth
Quoted 2 lines · Rafael Kitover
Use the test from
Makefileto check if vhost-user-gpu is being built, and if so require pixman.Fixes 9b52b17ba5 ("configure: Allow to build tools without pixman")... sorry, I missed that there is indeed a tool that requires pixman.
Quoted 31 lines
Signed-off-by Rafael Kitover <[email protected]>--- configure | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)configure +0
-14@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then fi fi -########################################## -# pixman support probe - -if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=$($pkg_config --cflags pixman-1) - pixman_libs=$($pkg_config --libs pixman-1) -else - error_exit "pixman >= 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probeconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4483
Quoted 7 lines
configure +4
-0@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then done fi +########################################## +# pixman support probe + +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes" ); thenDo you need the round brackets here?
Quoted 4 lines
configure +3
-0+ pixman_cflags= + pixman_libs= +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; thenconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4496
Quoted 10 lines
configure +7
-0+ pixman_cflags=$($pkg_config --cflags pixman-1) + pixman_libs=$($pkg_config --libs pixman-1) +else + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." +fi + ########################################## # libxml2 probe if test "$libxml2" != "no" ; thenWith the round brackets removed:
Quoted 3 lines
Reviewed-by Thomas Huth <[email protected]>
Hmm this doesn't work for me:
$ ../configure --disable-system --disable-user --enable-tools QEMU_CFLAGS -Werror -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -I/usr/include/p11-kit-1 -DSTRUCT_IOVEC_DEFINED -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/spice-1 -I/usr/include/spice-server -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/nss3 -I/usr/include/nspr4 -pthread -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/pixman-1 -I/usr/include/capstone QEMU_LDFLAGS -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -fstack-protector-strong target list static build no virgl support yes (0.7.0) TCG support no build guest agent yes
$ make vhost-user-gpu ... LINK vhost-user-gpu /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_create_2d': contrib/vhost-user-gpu/vhost-user-gpu.c:322: undefined reference to `pixman_image_create_bits' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_destroy': contrib/vhost-user-gpu/vhost-user-gpu.c:381: undefined reference to `pixman_image_unref' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_transfer_to_host_2d': contrib/vhost-user-gpu/vhost-user-gpu.c:538: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:540: undefined reference to `pixman_image_get_stride' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:543: undefined reference to `pixman_image_get_width' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:544: undefined reference to `pixman_image_get_data' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:556: undefined reference to `pixman_image_get_stride' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:557: undefined reference to `pixman_image_get_height' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:555: undefined reference to `pixman_image_get_data' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_flush': contrib/vhost-user-gpu/vhost-user-gpu.c:693: undefined reference to `pixman_region_init_rect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:705: undefined reference to `pixman_region_init' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:706: undefined reference to `pixman_region_init_rect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:709: undefined reference to `pixman_region_intersect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:711: undefined reference to `pixman_region_extents' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined reference to `pixman_image_create_bits' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:753: undefined reference to `pixman_image_composite' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:758: undefined reference to `pixman_image_unref' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:762: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:763: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:765: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `update_cursor_data_simple': contrib/vhost-user-gpu/vhost-user-gpu.c:863: undefined reference to `pixman_image_get_width' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:864: undefined reference to `pixman_image_get_height' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:868: undefined reference to `pixman_image_get_data' collect2: error: ld returned 1 exit status make: *** [Makefile:730: vhost-user-gpu] Error 1
$ lsb_release -d Description: Fedora release 30 (Thirty)
$ pkg-config --atleast-version=0.21.8 pixman-1; echo $? 0
$ pkg-config --cflags pixman-1 -I/usr/include/pixman-1 # found in QEMU_CFLAGS
$ pkg-config --libs pixman-1 -lpixman-1 # NOT found in QEMU_LDFLAGS
Thanks,
Phil.
Hi Rafael,
Quoted 161 lines · Philippe Mathieu-Daudé
Quoted 66 lines · Thomas Huth
Quoted 2 lines · Rafael Kitover
Use the test from
Makefileto check if vhost-user-gpu is being built, and if so require pixman.Fixes 9b52b17ba5 ("configure: Allow to build tools without pixman")... sorry, I missed that there is indeed a tool that requires pixman.
Quoted 31 lines
Signed-off-by Rafael Kitover <[email protected]>--- configure | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)configure +0
-14@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then fi fi -########################################## -# pixman support probe - -if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=$($pkg_config --cflags pixman-1) - pixman_libs=$($pkg_config --libs pixman-1) -else - error_exit "pixman >= 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probeconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4483
Quoted 7 lines
configure +4
-0@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then done fi +########################################## +# pixman support probe + +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes" ); thenDo you need the round brackets here?
Quoted 4 lines
configure +3
-0+ pixman_cflags= + pixman_libs= +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; thenconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4496
Quoted 10 lines
configure +7
-0+ pixman_cflags=$($pkg_config --cflags pixman-1) + pixman_libs=$($pkg_config --libs pixman-1) +else + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." +fi + ########################################## # libxml2 probe if test "$libxml2" != "no" ; thenWith the round brackets removed:
Quoted 3 lines
Reviewed-by Thomas Huth <[email protected]>Hmm this doesn't work for me:
$ ../configure --disable-system --disable-user --enable-tools QEMU_CFLAGS -Werror -pthread -I/usr/include/glib-2.0(quoted diff) +0
-15-I/usr/lib64/glib-2.0/include -fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -Wold-style-declaration -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -I/usr/include/p11-kit-1 -DSTRUCT_IOVEC_DEFINED -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/spice-1 -I/usr/include/spice-server -I/usr/include/cacard -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/nss3 -I/usr/include/nspr4 -pthread -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/pixman-1 -I/usr/include/capstone
QEMU_LDFLAGS-Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64
-fstack-protector-strong
target liststatic build no virgl support yes (0.7.0) TCG support nobuild guest agent yes
$ make vhost-user-gpu ... LINK vhost-user-gpu /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_create_2d': contrib/vhost-user-gpu/vhost-user-gpu.c:322: undefined reference to `pixman_image_create_bits' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_destroy': contrib/vhost-user-gpu/vhost-user-gpu.c:381: undefined reference to `pixman_image_unref' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_transfer_to_host_2d': contrib/vhost-user-gpu/vhost-user-gpu.c:538: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:540: undefined reference to `pixman_image_get_stride' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:543: undefined reference to `pixman_image_get_width' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:544: undefined reference to `pixman_image_get_data' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:556: undefined reference to `pixman_image_get_stride' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:557: undefined reference to `pixman_image_get_height' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:555: undefined reference to `pixman_image_get_data' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `vg_resource_flush': contrib/vhost-user-gpu/vhost-user-gpu.c:693: undefined reference to `pixman_region_init_rect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:705: undefined reference to `pixman_region_init' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:706: undefined reference to `pixman_region_init_rect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:709: undefined reference to `pixman_region_intersect' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:711: undefined reference to `pixman_region_extents' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined reference to `pixman_image_create_bits' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:753: undefined reference to `pixman_image_composite' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:758: undefined reference to `pixman_image_unref' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:762: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:763: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:765: undefined reference to `pixman_region_fini' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function `update_cursor_data_simple': contrib/vhost-user-gpu/vhost-user-gpu.c:863: undefined reference to `pixman_image_get_width' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:864: undefined reference to `pixman_image_get_height'
Quoted 8 lines
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined reference to `pixman_image_get_format' /usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:868: undefined reference to `pixman_image_get_data' collect2: error: ld returned 1 exit status make: *** [Makefile:730: vhost-user-gpu] Error 1
Any updates?
Thanks,
Phil.
Quoted 19 lines
$ lsb_release -d Description: Fedora release 30 (Thirty)$ pkg-config --atleast-version=0.21.8 pixman-1; echo $? 0$ pkg-config --cflags pixman-1 -I/usr/include/pixman-1 # found in QEMU_CFLAGS$ pkg-config --libs pixman-1 -lpixman-1 # NOT found in QEMU_LDFLAGSThanks,
Phil.
Quoted 73 lines · Philippe Mathieu-Daudé
Hi Rafael,
Quoted 70 lines · Philippe Mathieu-Daudé
Quoted 66 lines · Thomas Huth
Quoted 2 lines · Rafael Kitover
Use the test from
Makefileto check if vhost-user-gpu is being built, and if so require pixman.Fixes 9b52b17ba5 ("configure: Allow to build tools without pixman")... sorry, I missed that there is indeed a tool that requires pixman.
Quoted 31 lines
Signed-off-by Rafael Kitover <[email protected]>--- configure | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)configure +0
-14@@ -4062,20 +4062,6 @@ if test "$modules" = yes; then fi fi -########################################## -# pixman support probe - -if test "$softmmu" = "no"; then - pixman_cflags= - pixman_libs= -elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=$($pkg_config --cflags pixman-1) - pixman_libs=$($pkg_config --libs pixman-1) -else - error_exit "pixman >= 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probeconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4483
Quoted 7 lines
configure +4
-0@@ -4491,6 +4477,20 @@ if test "$opengl" = "yes" && test "$have_x11" = "yes"; then done fi +########################################## +# pixman support probe + +if test "$softmmu" = "no" && ! ( test "${linux} ${virglrenderer} ${gbm} ${want_tools}" = "yes yes yes yes" ); thenDo you need the round brackets here?
Quoted 4 lines
configure +3
-0+ pixman_cflags= + pixman_libs= +elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; thenconfigure if test "$opengl" = "yes" && test "$have_x11" = "yes"; then · line 4496
Quoted 10 lines
configure +7
-0+ pixman_cflags=$($pkg_config --cflags pixman-1) + pixman_libs=$($pkg_config --libs pixman-1) +else + error_exit "pixman >= 0.21.8 not present." \ + "Please install the pixman devel package." +fi + ########################################## # libxml2 probe if test "$libxml2" != "no" ; thenWith the round brackets removed:
Quoted 1 line
Reviewed-by Thomas Huth <[email protected]>Hmm this doesn't work for me:
[...]
Quoted 1 line
Any updates?
I think the problem is that ${virglrenderer} might only be set later in the configure script...
But since other tools might later depend on pixman, too, it's likely cleaner to introduce a CONFIG_PIXMAN switch and skip building of the corresponding tools in that case. I'll try to come up with a patch...
Thomas
Quoted 3 lines · Thomas Huth
Quoted 2 lines · Philippe Mathieu-Daudé
Hi Rafael,
Would these improvement can be implemented in python?
Signature · 6 lines
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo