[oe-commits] Ross Burton : avahi: fix and enable out-of-tree builds
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 17 18:23:02 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 6112a07f4e9865f7ae0e5a953669c1adf789f9f0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6112a07f4e9865f7ae0e5a953669c1adf789f9f0
Author: Ross Burton <ross.burton at intel.com>
Date: Tue Sep 17 11:38:24 2013 +0000
avahi: fix and enable out-of-tree builds
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/conf/distro/include/seperatebuilddir.inc | 5 +--
meta/recipes-connectivity/avahi/avahi.inc | 1 +
.../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 21d828f..8f2ebfa 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 7bb5381..6495ee9 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 0000000..43476cd
--- /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 at intel.com>
+
+From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton at 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
+
More information about the Openembedded-commits
mailing list