summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/seperatebuilddir.inc5
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc1
-rw-r--r--meta/recipes-connectivity/avahi/files/out-of-tree.patch32
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}"
34B_pn-autogen-native = "${SEPB}" 34B_pn-autogen-native = "${SEPB}"
35B_pn-automake = "${SEPB}" 35B_pn-automake = "${SEPB}"
36B_pn-automake-native = "${SEPB}" 36B_pn-automake-native = "${SEPB}"
37#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 37B_pn-avahi = "${SEPB}"
38#B_pn-avahi = "${SEPB}" 38B_pn-avahi-ui = "${SEPB}"
39#B_pn-avahi-ui = "${SEPB}"
40B_pn-babeltrace = "${SEPB}" 39B_pn-babeltrace = "${SEPB}"
41B_pn-base-passwd = "${SEPB}" 40B_pn-base-passwd = "${SEPB}"
42#B_pn-bash = "${SEPB}" 41#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 \
24 file://initscript.patch \ 24 file://initscript.patch \
25 file://avahi_fix_install_issue.patch \ 25 file://avahi_fix_install_issue.patch \
26 file://fix_for_automake_1.12.x.patch \ 26 file://fix_for_automake_1.12.x.patch \
27 file://out-of-tree.patch \
27 " 28 "
28 29
29USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 30USERADD_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 @@
1Upstream-Status: Pending
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 17 Sep 2013 12:27:36 +0100
7Subject: [PATCH] build-sys: fix out-of-tree builds without xmltoman
8
9If manpages are enabled but xmltoman isn't present, out-of-tree builds fail
10because it checks inside the build directory for the pre-generated manpages.
11
12Fix this by using $srcdir when looking for files inside the source directory.
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index 9debce2..047c7ae 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1021,7 +1021,7 @@ if test x$manpages = xyes ; then
22 fi
23
24 if test x$have_xmltoman = xno -o x$xmltoman = xno; then
25- if ! test -e man/avahi-daemon.8 ; then
26+ if ! test -e $srcdir/man/avahi-daemon.8 ; then
27 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])
28 exit 1
29 fi
30--
311.7.10.4
32