{"id":811464,"url":"http://patchwork.ozlabs.org/api/patches/811464/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908095506.13594-31-famz@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908095506.13594-31-famz@redhat.com>","list_archive_url":null,"date":"2017-09-08T09:54:58","name":"[PULL,30/38] buildsys: Move vnc cflags/libs to per object","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2e7a0ea74f9350bd3dd6a5dcdf05bdec3e629545","submitter":{"id":24872,"url":"http://patchwork.ozlabs.org/api/people/24872/?format=json","name":"Fam Zheng","email":"famz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170908095506.13594-31-famz@redhat.com/mbox/","series":[{"id":2164,"url":"http://patchwork.ozlabs.org/api/series/2164/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2164","date":"2017-09-08T09:54:28","name":"[PULL,01/38] docker: ensure NOUSER for travis images","version":1,"mbox":"http://patchwork.ozlabs.org/series/2164/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811464/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811464/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=famz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpY311K5Dz9rxj\n\tfor ;\n\tFri, 8 Sep 2017 20:09:49 +1000 (AEST)","from localhost ([::1]:44298 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqGEN-0003Qb-5u\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 06:09:47 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42141)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqG1K-0008Tw-4z\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:23 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqG1A-00054J-N0\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:18 -0400","from mx1.redhat.com ([209.132.183.28]:41468)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqG1A-00053O-EV\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 05:56:08 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 66F02C047B65;\n\tFri, 8 Sep 2017 09:56:07 +0000 (UTC)","from lemon.redhat.com (ovpn-12-98.pek2.redhat.com [10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0475760E3B;\n\tFri, 8 Sep 2017 09:56:05 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 66F02C047B65","From":"Fam Zheng ","To":"qemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 17:54:58 +0800","Message-Id":"<20170908095506.13594-31-famz@redhat.com>","In-Reply-To":"<20170908095506.13594-1-famz@redhat.com>","References":"<20170908095506.13594-1-famz@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 08 Sep 2017 09:56:07 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 30/38] buildsys: Move vnc cflags/libs to per\n\tobject","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Fam Zheng \nMessage-Id: <20170907082918.7299-4-famz@redhat.com>\nReviewed-by: Gerd Hoffmann \nReviewed-by: Philippe Mathieu-Daudé \nSigned-off-by: Fam Zheng \n---\n configure | 14 ++++++++------\n ui/Makefile.objs | 21 ++++++++++++---------\n 2 files changed, 20 insertions(+), 15 deletions(-)","diff":"diff --git a/configure b/configure\nindex 90a8851342..2b3db2f5c3 100755\n--- a/configure\n+++ b/configure\n@@ -2840,8 +2840,8 @@ EOF\n vnc_sasl_libs=\"-lsasl2\"\n if compile_prog \"$vnc_sasl_cflags\" \"$vnc_sasl_libs\" ; then\n vnc_sasl=yes\n- libs_softmmu=\"$vnc_sasl_libs $libs_softmmu\"\n- QEMU_CFLAGS=\"$QEMU_CFLAGS $vnc_sasl_cflags\"\n+ vnc_libs=\"$vnc_libs $vnc_sasl_libs\"\n+ vnc_cflags=\"$vnc_cflags $vnc_sasl_cflags\"\n else\n if test \"$vnc_sasl\" = \"yes\" ; then\n feature_not_found \"vnc-sasl\" \"Install Cyrus SASL devel\"\n@@ -2862,8 +2862,8 @@ EOF\n vnc_jpeg_libs=\"-ljpeg\"\n if compile_prog \"$vnc_jpeg_cflags\" \"$vnc_jpeg_libs\" ; then\n vnc_jpeg=yes\n- libs_softmmu=\"$vnc_jpeg_libs $libs_softmmu\"\n- QEMU_CFLAGS=\"$QEMU_CFLAGS $vnc_jpeg_cflags\"\n+ vnc_libs=\"$vnc_libs $vnc_jpeg_libs\"\n+ vnc_cflags=\"$vnc_cflags $vnc_jpeg_cflags\"\n else\n if test \"$vnc_jpeg\" = \"yes\" ; then\n feature_not_found \"vnc-jpeg\" \"Install libjpeg-turbo devel\"\n@@ -2894,8 +2894,8 @@ EOF\n fi\n if compile_prog \"$vnc_png_cflags\" \"$vnc_png_libs\" ; then\n vnc_png=yes\n- libs_softmmu=\"$vnc_png_libs $libs_softmmu\"\n- QEMU_CFLAGS=\"$QEMU_CFLAGS $vnc_png_cflags\"\n+ vnc_libs=\"$vnc_libs $vnc_png_libs\"\n+ vnc_cflags=\"$vnc_cflags $vnc_png_cflags\"\n else\n if test \"$vnc_png\" = \"yes\" ; then\n feature_not_found \"vnc-png\" \"Install libpng devel\"\n@@ -5563,6 +5563,8 @@ echo \"CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist\" >> $config_host_mak\n echo \"CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist\" >> $config_host_mak\n if test \"$vnc\" = \"yes\" ; then\n echo \"CONFIG_VNC=y\" >> $config_host_mak\n+ echo \"VNC_CFLAGS=$vnc_cflags\" >> $config_host_mak\n+ echo \"VNC_LIBS=$vnc_libs\" >> $config_host_mak\n fi\n if test \"$vnc_sasl\" = \"yes\" ; then\n echo \"CONFIG_VNC_SASL=y\" >> $config_host_mak\ndiff --git a/ui/Makefile.objs b/ui/Makefile.objs\nindex b3e29e21f0..a0b3c15a28 100644\n--- a/ui/Makefile.objs\n+++ b/ui/Makefile.objs\n@@ -1,11 +1,14 @@\n-vnc-obj-y += vnc.o\n-vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o\n-vnc-obj-y += vnc-enc-tight.o vnc-palette.o\n-vnc-obj-y += vnc-enc-zrle.o\n-vnc-obj-y += vnc-auth-vencrypt.o\n-vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o\n-vnc-obj-y += vnc-ws.o\n-vnc-obj-y += vnc-jobs.o\n+vnc.mo-objs += vnc.o\n+vnc.mo-objs += vnc-enc-zlib.o vnc-enc-hextile.o\n+vnc.mo-objs += vnc-enc-tight.o vnc-palette.o\n+vnc.mo-objs += vnc-enc-zrle.o\n+vnc.mo-objs += vnc-auth-vencrypt.o\n+vnc.mo-objs += $(if $(CONFIG_VNC_SASL), vnc-auth-sasl.o)\n+vnc.mo-objs += vnc-ws.o\n+vnc.mo-objs += vnc-jobs.o\n+\n+vnc.mo-cflags := $(VNC_CFLAGS)\n+vnc.mo-libs := $(VNC_LIBS)\n \n common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o\n common-obj-y += input.o input-keymap.o input-legacy.o\n@@ -14,7 +17,7 @@ common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o\n common-obj-$(CONFIG_SDL) += sdl.mo x_keymap.o\n common-obj-$(CONFIG_COCOA) += cocoa.o\n common-obj-$(CONFIG_CURSES) += curses.o\n-common-obj-$(CONFIG_VNC) += $(vnc-obj-y)\n+common-obj-$(CONFIG_VNC) += vnc.mo\n common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o\n \n ifeq ($(CONFIG_SDLABI),1.2)\n","prefixes":["PULL","30/38"]}