diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-09-20 15:16:20 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-09-21 13:46:46 -0700 |
| commit | 5486dcbf08200c22b6086d37055fb64de423eabe (patch) | |
| tree | 80ff1f94fd04044e221203c773cccf655f96e0a7 | |
| parent | f990853e39a4707cd81b0c15e96ef78461b7d90c (diff) | |
corosync: Fix compilation
Update to 1.2.8
Add corosync-docs.patch to fix html doc compilation
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes/corosync/corosync_1.2.8.bb (renamed from recipes/corosync/corosync_1.2.7.bb) | 7 | ||||
| -rw-r--r-- | 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 index b3f6f49b51..c3e4290009 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 0000000000..1b5fc30421 --- /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 + |