[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/12] block: use per-object cflags and libs
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/12] block: use per-object cflags and libs |
Date: |
Thu, 20 Feb 2014 13:28:55 +0100 |
From: Fam Zheng <address@hidden>
No longer adds flags and libs for them to global variables, instead
create config-host.mak variables like FOO_CFLAGS and FOO_LIBS, which is
used as per object cflags and libs.
This removes unwanted dependencies from libcacard.
Signed-off-by: Fam Zheng <address@hidden>
[Split from Fam's patch to enable modules. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/Makefile.objs | 13 ++++++++++++-
configure | 25 ++++++++++---------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/block/Makefile.objs b/block/Makefile.objs
index e254a21..673aa7c 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -24,4 +24,15 @@ common-obj-y += commit.o
common-obj-y += mirror.o
common-obj-y += backup.o
-$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS)
+iscsi.o-cflags := $(LIBISCSI_CFLAGS)
+iscsi.o-libs := $(LIBISCSI_LIBS)
+curl.o-cflags := $(CURL_CFLAGS)
+curl.o-libs := $(CURL_LIBS)
+rbd.o-cflags := $(RBD_CFLAGS)
+rbd.o-libs := $(RBD_LIBS)
+gluster.o-cflags := $(GLUSTERFS_CFLAGS)
+gluster.o-libs := $(GLUSTERFS_LIBS)
+ssh.o-cflags := $(LIBSSH2_CFLAGS)
+ssh.o-libs := $(LIBSSH2_LIBS)
+qcow.o-libs := -lz
+linux-aio.o-libs := -laio
diff --git a/configure b/configure
index 66b1d30..1201cc3 100755
--- a/configure
+++ b/configure
@@ -2318,8 +2318,6 @@ EOF
curl_libs=`$curlconfig --libs 2>/dev/null`
if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes
- libs_tools="$curl_libs $libs_tools"
- libs_softmmu="$curl_libs $libs_softmmu"
else
if test "$curl" = "yes" ; then
feature_not_found "curl" "Install libcurl devel"
@@ -2475,8 +2473,6 @@ EOF
rbd_libs="-lrbd -lrados"
if compile_prog "" "$rbd_libs" ; then
rbd=yes
- libs_tools="$rbd_libs $libs_tools"
- libs_softmmu="$rbd_libs $libs_softmmu"
else
if test "$rbd" = "yes" ; then
feature_not_found "rados block device" "Install librbd/ceph devel"
@@ -2493,9 +2489,6 @@ if test "$libssh2" != "no" ; then
libssh2_cflags=`$pkg_config libssh2 --cflags`
libssh2_libs=`$pkg_config libssh2 --libs`
libssh2=yes
- libs_tools="$libssh2_libs $libs_tools"
- libs_softmmu="$libssh2_libs $libs_softmmu"
- QEMU_CFLAGS="$QEMU_CFLAGS $libssh2_cflags"
else
if test "$libssh2" = "yes" ; then
error_exit "libssh2 >= $min_libssh2_version required for
--enable-libssh2"
@@ -2541,8 +2534,6 @@ int main(void) { io_setup(0, NULL); io_set_eventfd(NULL,
0); eventfd(0, 0); retu
EOF
if compile_prog "" "-laio" ; then
linux_aio=yes
- libs_softmmu="$libs_softmmu -laio"
- libs_tools="$libs_tools -laio"
else
if test "$linux_aio" = "yes" ; then
feature_not_found "linux AIO" "Install libaio devel"
@@ -2711,9 +2702,6 @@ if test "$glusterfs" != "no" ; then
glusterfs="yes"
glusterfs_cflags=`$pkg_config --cflags glusterfs-api`
glusterfs_libs=`$pkg_config --libs glusterfs-api`
- CFLAGS="$CFLAGS $glusterfs_cflags"
- libs_tools="$glusterfs_libs $libs_tools"
- libs_softmmu="$glusterfs_libs $libs_softmmu"
if $pkg_config --atleast-version=5 glusterfs-api; then
glusterfs_discard="yes"
fi
@@ -3084,11 +3072,9 @@ EOF
libiscsi="yes"
libiscsi_cflags=$($pkg_config --cflags libiscsi)
libiscsi_libs=$($pkg_config --libs libiscsi)
- CFLAGS="$CFLAGS $libiscsi_cflags"
- LIBS="$LIBS $libiscsi_libs"
elif compile_prog "" "-liscsi" ; then
libiscsi="yes"
- LIBS="$LIBS -liscsi"
+ libiscsi_libs="-liscsi"
else
if test "$libiscsi" = "yes" ; then
feature_not_found "libiscsi" "Install libiscsi devel"
@@ -4101,6 +4087,7 @@ fi
if test "$curl" = "yes" ; then
echo "CONFIG_CURL=y" >> $config_host_mak
echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
+ echo "CURL_LIBS=$curl_libs" >> $config_host_mak
fi
if test "$brlapi" = "yes" ; then
echo "CONFIG_BRLAPI=y" >> $config_host_mak
@@ -4193,6 +4180,8 @@ if test "$libiscsi" = "yes" ; then
if test "$libiscsi_version" = "1.4.0"; then
echo "CONFIG_LIBISCSI_1_4=y" >> $config_host_mak
fi
+ echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
+ echo "LIBISCSI_LIBS=$libiscsi_libs" >> $config_host_mak
fi
if test "$libnfs" = "yes" ; then
@@ -4218,6 +4207,8 @@ if test "$qom_cast_debug" = "yes" ; then
fi
if test "$rbd" = "yes" ; then
echo "CONFIG_RBD=y" >> $config_host_mak
+ echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
+ echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
fi
echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
@@ -4261,6 +4252,8 @@ fi
if test "$glusterfs" = "yes" ; then
echo "CONFIG_GLUSTERFS=y" >> $config_host_mak
+ echo "GLUSTERFS_CFLAGS=$glusterfs_cflags" >> $config_host_mak
+ echo "GLUSTERFS_LIBS=$glusterfs_libs" >> $config_host_mak
fi
if test "$glusterfs_discard" = "yes" ; then
@@ -4273,6 +4266,8 @@ fi
if test "$libssh2" = "yes" ; then
echo "CONFIG_LIBSSH2=y" >> $config_host_mak
+ echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak
+ echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak
fi
if test "$virtio_blk_data_plane" = "yes" ; then
--
1.8.3.1
- [Qemu-devel] [PULL respin 00/12] Build system changes for 2014-02-20, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 02/12] rules.mak: fix $(obj) to a real relative path, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 01/12] util: Split out exec_dir from os_find_datadir, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 03/12] rules.mak: allow per object cflags and libs, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 04/12] block: use per-object cflags and libs,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/12] darwin: do not use -mdynamic-no-pic, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 06/12] rules.mak: introduce DSO rules, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 07/12] module: implement module loading, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 11/12] configure: Disable libtool if -fPIE does not work with it (bug #1257099), Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 08/12] Makefile: install modules with "make install", Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 09/12] Makefile: introduce common-obj-m and block-obj-m for DSO, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 10/12] block: convert block drivers linked with libs to modules, Paolo Bonzini, 2014/02/20
- [Qemu-devel] [PULL 12/12] build: softmmu targets do not have a "main.o" file, Paolo Bonzini, 2014/02/20
- Re: [Qemu-devel] [PULL respin 00/12] Build system changes for 2014-02-20, Peter Maydell, 2014/02/24