diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-09-17 11:38:24 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 19:28:08 +0100 |
| commit | 6112a07f4e9865f7ae0e5a953669c1adf789f9f0 (patch) | |
| tree | 9e12d82e7de01645df48b559055c50641f78c231 | |
| parent | 9f0427edee6bf62d3fe7cdceb07f59a5776c8c4f (diff) | |
| download | openembedded-core-6112a07f4e9865f7ae0e5a953669c1adf789f9f0.tar.gz | |
avahi: fix and enable out-of-tree builds
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/seperatebuilddir.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/files/out-of-tree.patch | 32 |
3 files changed, 35 insertions, 3 deletions
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index 21d828fa03..8f2ebfa8fb 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -34,9 +34,8 @@ B_pn-autoconf-native = "${SEPB}" B_pn-autogen-native = "${SEPB}" B_pn-automake = "${SEPB}" B_pn-automake-native = "${SEPB}" -#configure: error: *** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman -#B_pn-avahi = "${SEPB}" -#B_pn-avahi-ui = "${SEPB}" +B_pn-avahi = "${SEPB}" +B_pn-avahi-ui = "${SEPB}" B_pn-babeltrace = "${SEPB}" B_pn-base-passwd = "${SEPB}" #B_pn-bash = "${SEPB}" diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 7bb53810a6..6495ee9ed8 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -24,6 +24,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://initscript.patch \ file://avahi_fix_install_issue.patch \ file://fix_for_automake_1.12.x.patch \ + file://out-of-tree.patch \ " USERADD_PACKAGES = "avahi-daemon avahi-autoipd" diff --git a/meta/recipes-connectivity/avahi/files/out-of-tree.patch b/meta/recipes-connectivity/avahi/files/out-of-tree.patch new file mode 100644 index 0000000000..43476cde05 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/out-of-tree.patch @@ -0,0 +1,32 @@ +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 17 Sep 2013 12:27:36 +0100 +Subject: [PATCH] build-sys: fix out-of-tree builds without xmltoman + +If manpages are enabled but xmltoman isn't present, out-of-tree builds fail +because it checks inside the build directory for the pre-generated manpages. + +Fix this by using $srcdir when looking for files inside the source directory. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9debce2..047c7ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1021,7 +1021,7 @@ if test x$manpages = xyes ; then + fi + + if test x$have_xmltoman = xno -o x$xmltoman = xno; then +- if ! test -e man/avahi-daemon.8 ; then ++ if ! test -e $srcdir/man/avahi-daemon.8 ; then + AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman]) + exit 1 + fi +-- +1.7.10.4 + |