Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From dcfc263db9e69e5381cb511c51836271dec577a3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
| 3 | Date: Thu, 10 May 2018 13:27:47 -0400 |
| 4 | Subject: [PATCH] Makefiles: Add more $XDR_CFLAGS as needed |
| 5 | |
| 6 | When building with libtirpc instead of libc-xdr the include search |
| 7 | path needs to be used. In several places this was missing and it was |
| 8 | only looking in /usr/include and failing. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [old release] |
| 11 | |
| 12 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
| 13 | --- |
| 14 | src/Makefile.am | 5 +++-- |
| 15 | tests/Makefile.am | 1 + |
| 16 | 2 files changed, 4 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 19 | index e9ce941..38114b7 100644 |
| 20 | --- a/src/Makefile.am |
| 21 | +++ b/src/Makefile.am |
| 22 | @@ -1157,7 +1157,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver.la |
| 23 | libvirt_driver_la_SOURCES = $(DRIVER_SOURCES) |
| 24 | |
| 25 | libvirt_driver_la_CFLAGS = \ |
| 26 | - $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \ |
| 27 | + $(GNUTLS_CFLAGS) $(CURL_CFLAGS) $(XDR_CFLAGS) \ |
| 28 | -I$(srcdir)/conf $(AM_CFLAGS) |
| 29 | libvirt_driver_la_LIBADD = \ |
| 30 | $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) |
| 31 | @@ -1348,6 +1348,7 @@ endif ! WITH_DRIVER_MODULES |
| 32 | |
| 33 | libvirt_driver_qemu_impl_la_CFLAGS = \ |
| 34 | $(GNUTLS_CFLAGS) \ |
| 35 | + $(XDR_CFLAGS) \ |
| 36 | $(LIBNL_CFLAGS) \ |
| 37 | -I$(srcdir)/access \ |
| 38 | -I$(srcdir)/conf \ |
| 39 | @@ -2306,7 +2307,7 @@ libvirt_lxc_la_LDFLAGS = \ |
| 40 | $(CYGWIN_EXTRA_LDFLAGS) \ |
| 41 | $(MINGW_EXTRA_LDFLAGS) \ |
| 42 | $(NULL) |
| 43 | -libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) |
| 44 | +libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) $(XDR_CFLAGS) |
| 45 | libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) |
| 46 | |
| 47 | # Since virt-login-shell will be setuid, we must do everything |
| 48 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 49 | index 2f8b9eb..aec9a3e 100644 |
| 50 | --- a/tests/Makefile.am |
| 51 | +++ b/tests/Makefile.am |
| 52 | @@ -48,6 +48,7 @@ AM_CFLAGS = \ |
| 53 | $(APPARMOR_CFLAGS) \ |
| 54 | $(YAJL_CFLAGS) \ |
| 55 | $(COVERAGE_CFLAGS) \ |
| 56 | + $(XDR_CFLAGS) \ |
| 57 | $(WARN_CFLAGS) |
| 58 | |
| 59 | AM_LDFLAGS = \ |
| 60 | -- |
| 61 | 2.7.4 |
| 62 | |