sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

avahi: fix configure with automake 1.11.2 

automake version 1.11.2 has made use of dir variables more strict.
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.

(From OE-Core rev: ea7e61c14f7fcf917ea1cf4811e5cceb5003a030)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble 2011-12-28 11:59:52 -08:00 committed by Richard Purdie
parent 5365bd6c0f
commit 5b5914f143
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-connectivity/avahi/avahi.inc
View File

@ -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 \

44
meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch Normal file
View File

@ -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' \