qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] block/dmg: make it modular if using additional library
@ 2015-03-10  7:06 Michael Tokarev
  2015-03-10  8:50 ` Kevin Wolf
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-03-10  7:06 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Kevin Wolf, Michael Tokarev, Peter Wu

block/dmg can use additional library (libbz2) to read
bzip2-compressed files.  Make the block driver to be
a module if libbz2 support is requested, to avoid extra
library dependency by default.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
--

This might be questionable, to make the thing to be either
module or built-in depending on build environment, so a
better idea may be to make it modular unconditionally.
This block device format isn't used often.

 block/Makefile.objs | 3 ++-
 configure           | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/Makefile.objs b/block/Makefile.objs
index db2933e..440c51f 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -1,7 +1,8 @@
-block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
+block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o
 block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o
 block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
 block-obj-y += qed-check.o
+block-obj-$(CONFIG_DMG) += dmg.o
 block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o
 block-obj-$(CONFIG_QUORUM) += quorum.o
 block-obj-y += parallels.o blkdebug.o blkverify.o
diff --git a/configure b/configure
index 7ba4bcb..1dd5721 100755
--- a/configure
+++ b/configure
@@ -4772,6 +4772,9 @@ fi
 if test "$bzip2" = "yes" ; then
   echo "CONFIG_BZIP2=y" >> $config_host_mak
   echo "BZIP2_LIBS=-lbz2" >> $config_host_mak
+  echo "CONFIG_DMG=m" >> $config_host_mak
+else
+  echo "CONFIG_DMG=y" >> $config_host_mak
 fi
 
 if test "$libiscsi" = "yes" ; then
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2015-03-11 13:23 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-10  7:06 [Qemu-devel] [PATCH] block/dmg: make it modular if using additional library Michael Tokarev
2015-03-10  8:50 ` Kevin Wolf
2015-03-10  9:17   ` Fam Zheng
2015-03-10 10:09     ` Kevin Wolf
2015-03-10 13:24       ` Markus Armbruster
2015-03-10 13:31         ` Michael Tokarev
2015-03-10 13:59         ` Kevin Wolf
2015-03-10 13:58       ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-03-10 14:01         ` Michael Tokarev
2015-03-10 14:07           ` Kevin Wolf
2015-03-10 14:38             ` [Qemu-devel] " Michael Tokarev
2015-03-11 13:17               ` Stefan Hajnoczi
2015-03-11 13:06           ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-03-10  9:10 ` [Qemu-devel] " Peter Wu
2015-03-11 13:23 ` Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).