[oe-commits] Khem Raj : corosync: Fix compilation

[git version control]

Module: openembedded.git
Branch: master
Commit: 5486dcbf08200c22b6086d37055fb64de423eabe
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5486dcbf08200c22b6086d37055fb64de423eabe

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Sep 20 15:16:20 2010 -0700

corosync: Fix compilation

Update to 1.2.8

Add corosync-docs.patch to fix html doc compilation

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 .../{corosync_1.2.7.bb => corosync_1.2.8.bb}       |    7 ++--
 recipes/corosync/files/corosync-docs.patch         |   38 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/recipes/corosync/corosync_1.2.7.bb b/recipes/corosync/corosync_1.2.8.bb
similarity index 85%
rename from recipes/corosync/corosync_1.2.7.bb
rename to recipes/corosync/corosync_1.2.8.bb
index b3f6f49..c3e4290 100644
--- a/recipes/corosync/corosync_1.2.7.bb
+++ b/recipes/corosync/corosync_1.2.8.bb
@@ -1,19 +1,20 @@
 DESCRIPTION = "OSI Certified implementation of a complete cluster engine"
 LICENSE = "BSD"
+DEPENDS = "groff-native"
 
 PR = "r0"
 
 SRC_URI = " \
 	ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \
 	file://fix-lcrso-linkage.patch \
+	file://corosync-docs.patch \
 	file://init \
 	file://corosync.conf \
 	file://volatiles \
 	file://fix-define-semun-union.patch \
 	"
-SRC_URI[md5sum] = "a1f5b03512977d495819e2ed05ba645b"
-SRC_URI[sha256sum] = "0f774cee5d9f5d3e20b146c8719115c029815015952b48de1b99b61b462367d1"
-
+SRC_URI[md5sum] = "43e97ef0d964ccb4063f40a4478eb679"
+SRC_URI[sha256sum] = "424b0590e52a08cf9066f9edbac4edf84e9d9bff54dd5036fb681d917db02bc8"
 
 inherit autotools update-rc.d
 
diff --git a/recipes/corosync/files/corosync-docs.patch b/recipes/corosync/files/corosync-docs.patch
new file mode 100644
index 0000000..1b5fc30
--- /dev/null
+++ b/recipes/corosync/files/corosync-docs.patch
@@ -0,0 +1,38 @@
+Make docs optional
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -432,7 +432,7 @@
+ fi
+ 
+ # final build of *FLAGS
+-CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
++CFLAGS="$ENV_CFLAGS $OS_CFLAGS \
+ 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
+ CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
+ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
+@@ -458,7 +458,10 @@
+ AC_SUBST([DARWIN_OPTS])
+ AC_SUBST([SOLARIS_OPTS])
+ 
+-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
++AC_ARG_ENABLE([doc],
++  AS_HELP_STRING([--enable-doc],[Build html documentation])
++)
++AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
+ 
+ AC_SUBST([LINT_FLAGS])
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -41,9 +41,6 @@
+ 			  config.guess config.sub missing install-sh \
+ 			  autoheader automake autoconf
+ 
+-dist_doc_DATA		= LICENSE INSTALL README.devmap \
+-			  README.recovery SECURITY TODO AUTHORS
+-
+ corosysconfdir		= ${COROSYSCONFDIR}
+
+ corosysconf_DATA        = conf/corosync.conf.example
+