[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/3] buildsys: Move nettle cflags/libs to per obj
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 1/3] buildsys: Move nettle cflags/libs to per object |
Date: |
Wed, 6 Sep 2017 09:27:13 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
configure | 5 ++---
crypto/Makefile.objs | 6 ++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index fb7e34a901..6a4cb3832b 100755
--- a/configure
+++ b/configure
@@ -2616,9 +2616,6 @@ if test "$nettle" != "no"; then
nettle_cflags=$($pkg_config --cflags nettle)
nettle_libs=$($pkg_config --libs nettle)
nettle_version=$($pkg_config --modversion nettle)
- libs_softmmu="$nettle_libs $libs_softmmu"
- libs_tools="$nettle_libs $libs_tools"
- QEMU_CFLAGS="$QEMU_CFLAGS $nettle_cflags"
nettle="yes"
cat > $TMPC << EOF
@@ -5732,6 +5729,8 @@ if test "$nettle" = "yes" ; then
if test "$nettle_kdf" = "yes" ; then
echo "CONFIG_NETTLE_KDF=y" >> $config_host_mak
fi
+ echo "NETTLE_CFLAGS=$nettle_cflags" >> $config_host_mak
+ echo "NETTLE_LIBS=$nettle_libs" >> $config_host_mak
fi
if test "$tasn1" = "yes" ; then
echo "CONFIG_TASN1=y" >> $config_host_mak
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index 2b99e08062..a936957d03 100644
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -34,6 +34,12 @@ crypto-obj-y += block.o
crypto-obj-y += block-qcow.o
crypto-obj-y += block-luks.o
+$(if $(CONFIG_NETTLE), \
+ $(foreach x, cipher hash-nettle hmac-nettle pbkdf-nettle, \
+ $(eval $x.o-cflags := $(NETTLE_CFLAGS)) \
+ $(eval $x.o-libs := $(NETTLE_LIBS))) \
+)
+
# Let the userspace emulators avoid linking gnutls/etc
crypto-aes-obj-y = aes.o
--
2.13.5