| Message ID | 20170906074418.10903-3-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/3] buildsys: Move nettle cflags/libs to per object | expand |
On Wed, Sep 06, 2017 at 03:44:17PM +0800, Fam Zheng wrote: > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > configure | 5 ++--- > crypto/Makefile.objs | 7 +++++++ > tests/Makefile.include | 10 +++++----- > 3 files changed, 14 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 6a4cb3832b..6d90e73a8b 100755 > --- a/configure > +++ b/configure > @@ -2472,9 +2472,6 @@ if test "$gnutls" != "no"; then > if gnutls_works; then > gnutls_cflags=$($pkg_config --cflags gnutls) > gnutls_libs=$($pkg_config --libs gnutls) > - libs_softmmu="$gnutls_libs $libs_softmmu" > - libs_tools="$gnutls_libs $libs_tools" > - QEMU_CFLAGS="$QEMU_CFLAGS $gnutls_cflags" > gnutls="yes" > > # gnutls_rnd requires >= 2.11.0 > @@ -5710,6 +5707,8 @@ fi > echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak > if test "$gnutls" = "yes" ; then > echo "CONFIG_GNUTLS=y" >> $config_host_mak > + echo "GNUTLS_CFLAGS=$gnutls_cflags" >> $config_host_mak > + echo "GNUTLS_LIBS=$gnutls_libs" >> $config_host_mak > fi > if test "$gnutls_rnd" = "yes" ; then > echo "CONFIG_GNUTLS_RND=y" >> $config_host_mak > diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs > index a936957d03..0cb5fa24b6 100644 > --- a/crypto/Makefile.objs > +++ b/crypto/Makefile.objs > @@ -40,6 +40,13 @@ $(if $(CONFIG_NETTLE), \ > $(eval $x.o-libs := $(NETTLE_LIBS))) \ > ) > > +$(if $(CONFIG_GNUTLS), \ > + $(foreach x, init random-gnutls tlscreds tlscredsanon \ > + tlscredsx509 tlssession, \ > + $(eval $x.o-cflags := $(GNUTLS_CFLAGS)) \ > + $(eval $x.o-libs := $(GNUTLS_LIBS))) \ > +) > + > # Let the userspace emulators avoid linking gnutls/etc > crypto-aes-obj-y = aes.o > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index fae5715e9c..d46c22d1ec 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -677,15 +677,15 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(test-c > tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypto-obj-y) > tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-y) > > -tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS) > -tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS) > -tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS) > +tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) > +tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS) $(GNUTLS_LIBS) > +tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_LIBS) > > -tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS) > +tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) > tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ > tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) > > -tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS) > +tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) > tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ > tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) > tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
diff --git a/configure b/configure index 6a4cb3832b..6d90e73a8b 100755 --- a/configure +++ b/configure @@ -2472,9 +2472,6 @@ if test "$gnutls" != "no"; then if gnutls_works; then gnutls_cflags=$($pkg_config --cflags gnutls) gnutls_libs=$($pkg_config --libs gnutls) - libs_softmmu="$gnutls_libs $libs_softmmu" - libs_tools="$gnutls_libs $libs_tools" - QEMU_CFLAGS="$QEMU_CFLAGS $gnutls_cflags" gnutls="yes" # gnutls_rnd requires >= 2.11.0 @@ -5710,6 +5707,8 @@ fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak if test "$gnutls" = "yes" ; then echo "CONFIG_GNUTLS=y" >> $config_host_mak + echo "GNUTLS_CFLAGS=$gnutls_cflags" >> $config_host_mak + echo "GNUTLS_LIBS=$gnutls_libs" >> $config_host_mak fi if test "$gnutls_rnd" = "yes" ; then echo "CONFIG_GNUTLS_RND=y" >> $config_host_mak diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index a936957d03..0cb5fa24b6 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -40,6 +40,13 @@ $(if $(CONFIG_NETTLE), \ $(eval $x.o-libs := $(NETTLE_LIBS))) \ ) +$(if $(CONFIG_GNUTLS), \ + $(foreach x, init random-gnutls tlscreds tlscredsanon \ + tlscredsx509 tlssession, \ + $(eval $x.o-cflags := $(GNUTLS_CFLAGS)) \ + $(eval $x.o-libs := $(GNUTLS_LIBS))) \ +) + # Let the userspace emulators avoid linking gnutls/etc crypto-aes-obj-y = aes.o diff --git a/tests/Makefile.include b/tests/Makefile.include index fae5715e9c..d46c22d1ec 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -677,15 +677,15 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(test-c tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypto-obj-y) tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-y) -tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS) -tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS) -tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS) +tests/crypto-tls-x509-helpers.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) +tests/crypto-tls-x509-helpers.o-libs := $(TASN1_LIBS) $(GNUTLS_LIBS) +tests/pkix_asn1_tab.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_LIBS) -tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS) +tests/test-crypto-tlscredsx509.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) -tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS) +tests/test-crypto-tlssession.o-cflags := $(TASN1_CFLAGS) $(GNUTLS_CFLAGS) tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y)
Signed-off-by: Fam Zheng <famz@redhat.com> --- configure | 5 ++--- crypto/Makefile.objs | 7 +++++++ tests/Makefile.include | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-)