diff options
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch | 44 |
2 files changed, 47 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index deebbd6bb..3cee1a497 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,14 +14,15 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r10" +INC_PR = "r11" DEPENDS = "expat libcap libdaemon dbus glib-2.0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ file://99avahi-autoipd \ - file://initscript.patch" + file://initscript.patch \ + file://fix_for_automake_1.11.2.patch" USERADD_PACKAGES = "avahi-daemon" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch new file mode 100644 index 000000000..e7a1908a6 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch @@ -0,0 +1,44 @@ +Upstream-Status: Pending + +automake version 1.11.2 has made use of dir variables more strict. +the use of pkglibdir with DATA var results in automake errors. + This commits uses pkgdatadir var instead of pkglibdir to avoid +the strict check errors. + +Fixes this error: +service-type-database/Makefile.am:21: `pkglibdir' is not a legitimate directory for `DATA' +autoreconf: automake failed with exit status: 1 +ERROR: autoreconf execution failed. + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2011/12/28 + + +Index: avahi-0.6.30/service-type-database/Makefile.am +=================================================================== +--- avahi-0.6.30.orig/service-type-database/Makefile.am ++++ avahi-0.6.30/service-type-database/Makefile.am +@@ -18,13 +18,12 @@ + EXTRA_DIST=build-db.in service-types + + pkgdata_DATA=service-types +-pkglib_DATA= + + if HAVE_PYTHON + if HAVE_GDBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db ++pkgdata_DATA+=service-types.db + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@@ -41,7 +40,7 @@ endif + if HAVE_DBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db.pag service-types.db.dir ++pkgdata_DATA+=service-types.db.pag service-types.db.dir + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ |