diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-02 22:03:58 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:33:03 +0000 |
| commit | e69a1a583bf65dd2b6358c1d925d8de6419e3d76 (patch) | |
| tree | 0006f69817b8435c97defb138a8a24205e681998 /meta | |
| parent | 7b6546e0ee5561ece1c7972bb8dde7383b530eb7 (diff) | |
| download | openembedded-core-e69a1a583bf65dd2b6358c1d925d8de6419e3d76.tar.gz openembedded-core-e69a1a583bf65dd2b6358c1d925d8de6419e3d76.tar.bz2 openembedded-core-e69a1a583bf65dd2b6358c1d925d8de6419e3d76.zip | |
cups: check avahi before use it
Fixed the error when --disable-avahi:
ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll'
The avahi is optional, we need check whether it is enabled before use as
other code does.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 16fdd4f363..5ff557a55e 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -10,6 +10,7 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://cups.socket \ file://cups.path \ file://cups.service \ + file://0001-test-ippserver.c-check-avahi-before-use.patch \ " LEAD_SONAME = "libcupsdriver.so" diff --git a/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch b/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch new file mode 100644 index 0000000000..4bcff69b77 --- /dev/null +++ b/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch @@ -0,0 +1,34 @@ +From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Sat, 3 Jan 2015 05:56:24 +0000 +Subject: [PATCH] test/ippserver.c: check avahi before use it + +Fixed the error when --disable-avahi: +ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll' + +The avahi is optional, we need check whether it is enabled before use as +other code does. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + test/ippserver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ippserver.c b/test/ippserver.c +index c785e5f..26c8a66 100644 +--- a/test/ippserver.c ++++ b/test/ippserver.c +@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); + + # ifdef HAVE_DNSSD + static DNSServiceRef DNSSDMaster = NULL; +-# else /* HAVE_AVAHI */ ++# elif defined(HAVE_AVAHI) /* HAVE_AVAHI */ + static AvahiThreadedPoll *DNSSDMaster = NULL; + static AvahiClient *DNSSDClient = NULL; + # endif /* HAVE_DNSSD */ +-- +2.0.1 + |