From patchwork Wed Feb 27 03:10:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 223483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 295B62C0E5D for ; Wed, 27 Feb 2013 14:12:44 +1100 (EST) Received: from localhost ([::1]:59599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXRi-0007rU-6b for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 22:12:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXRE-0007W7-SR for qemu-devel@nongnu.org; Tue, 26 Feb 2013 22:12:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAXRD-0006JX-CX for qemu-devel@nongnu.org; Tue, 26 Feb 2013 22:12:12 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:60875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXRC-0006JI-QT for qemu-devel@nongnu.org; Tue, 26 Feb 2013 22:12:11 -0500 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Feb 2013 08:38:43 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 27 Feb 2013 08:38:42 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 431831258023 for ; Wed, 27 Feb 2013 08:42:59 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1R3C0KK24117478 for ; Wed, 27 Feb 2013 08:42:02 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1R3C4FX024969 for ; Wed, 27 Feb 2013 14:12:04 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.44]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1R3A7fY018808; Wed, 27 Feb 2013 14:12:03 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 27 Feb 2013 11:10:11 +0800 Message-Id: <1361934618-32026-4-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1361934618-32026-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1361934618-32026-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022703-5816-0000-0000-000006D8CAAA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.2 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V20 03/10] libqblock: build: add configure support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rule for libqblock.la will be included if it is enabled, and will be added to 'all' to be automatically built. Only support Linux now, to save trouble in building on windows. Signed-off-by: Wenchao Xia --- Makefile | 3 +++ configure | 32 ++++++++++++++++++++++++++++++++ libqblock/Makefile | 4 ++++ 3 files changed, 39 insertions(+), 0 deletions(-) create mode 100644 libqblock/Makefile diff --git a/Makefile b/Makefile index 7457005..a63abbf 100644 --- a/Makefile +++ b/Makefile @@ -114,6 +114,9 @@ endif ifeq ($(CONFIG_SMARTCARD_NSS),y) include $(SRC_PATH)/libcacard/Makefile endif +ifeq ($(CONFIG_LIBQBLOCK),y) +include $(SRC_PATH)/libqblock/Makefile +endif all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all diff --git a/configure b/configure index 2bda2d5..dc53fa8 100755 --- a/configure +++ b/configure @@ -228,6 +228,8 @@ glusterfs="" virtio_blk_data_plane="" gtk="" gtkabi="2.0" +libqblock="" +libqblock_requires_y="" # parse CC options first for opt do @@ -906,6 +908,10 @@ for opt do ;; --with-gtkabi=*) gtkabi="$optarg" ;; + --disable-libqblock) libqblock="no" + ;; + --enable-libqblock) libqblock="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1157,6 +1163,8 @@ echo " --enable-glusterfs enable GlusterFS backend" echo " --disable-glusterfs disable GlusterFS backend" echo " --enable-gcov enable test coverage analysis with gcov" echo " --gcov=GCOV use specified gcov [$gcov_tool]" +echo " --enable-libqblock enable shared library libqblock" +echo " --disable-libqblock disable shared library libqblock" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -2485,6 +2493,23 @@ EOF fi fi +########################################## +# libqblock probe +if test "$libqblock" != "no"; then + if test -n "$libtool" && test -n "$glib_libs" && \ + test "$linux" = "yes" \ + ; then + # Only support Linux now, check for librt and libz are missing, add it later. + libqblock="yes" + libqblock_requires_y="gthread-2.0 glib-2.0 rt z" + else + if test "$libqblock" = "yes"; then + feature_not_found "libqblock" + fi + libqblock="no" + fi +fi + # # Check for xxxat() functions when we are building linux-user # emulator. This is done because older glibc versions don't @@ -3426,6 +3451,7 @@ echo "GlusterFS support $glusterfs" echo "virtio-blk-data-plane $virtio_blk_data_plane" echo "gcov $gcov_tool" echo "gcov enabled $gcov" +echo "libqblock support $libqblock" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3792,6 +3818,11 @@ if test "$virtio_blk_data_plane" = "yes" ; then echo "CONFIG_VIRTIO_BLK_DATA_PLANE=y" >> $config_host_mak fi +if test "$libqblock" = "yes" ; then + echo "CONFIG_LIBQBLOCK=y" >> $config_host_mak + echo "libqblock-requires-y=$libqblock_requires_y" >> $config_host_mak +fi + # USB host support case "$usb" in linux) @@ -4376,6 +4407,7 @@ DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" +DIRS="$DIRS libqblock" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile po/Makefile" diff --git a/libqblock/Makefile b/libqblock/Makefile new file mode 100644 index 0000000..8173da7 --- /dev/null +++ b/libqblock/Makefile @@ -0,0 +1,4 @@ +all: libqblock.la + +libqblock.la: + @true