diff options
| author |   Roman I Khimov <khimov@altell.ru> | 2010-07-01 19:26:03 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-07-12 08:47:58 +0400 |
| commit | f65a2a31d30291ce81ce3b4042b41cf66bb41810 (patch) | |
| tree | b7dcf70490885f9c5730bfae40706830c162b6c5 /recipes/pacemaker/pacemaker-1.0.9.1 | |
| parent | ac8b14020e0f6ea4cdfd94c1db971ac9f4895f4f (diff) | |
| download | openembedded-f65a2a31d30291ce81ce3b4042b41cf66bb41810.tar.gz | |
pacemaker: update to version 1.0.9.1
* bugfix release, considered as safe upgrade
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Diffstat (limited to 'recipes/pacemaker/pacemaker-1.0.9.1')
3 files changed, 54 insertions, 0 deletions
diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch b/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch new file mode 100644 index 0000000000..02ce26ec90 --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch @@ -0,0 +1,16 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-04-06 13:08:53.000000000 +0400 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-04-06 13:08:58.000000000 +0400 +@@ -106,9 +106,8 @@ + Cfile=/tmp/extract_define.$2.${$} + printf "#include <stdio.h>\n" > ${Cfile}.c + printf "#include <%s>\n" $1 >> ${Cfile}.c +- printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c +- $CC $CFLAGS ${Cfile}.c -o ${Cfile} +- value=`${Cfile}` ++ printf "\"%s\":%s\n" $2 $2 >> ${Cfile}.c ++ value=`$CC $CFLAGS -E ${Cfile}.c | grep \"$2\" | cut -f 2 -d ':' | sed 's,^",,' | sed 's,"$,,'` + AC_MSG_RESULT($value) + printf $value + rm -f ${Cfile}.c ${Cfile} diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch new file mode 100644 index 0000000000..da970d5079 --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch @@ -0,0 +1,16 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-23 12:03:29.000000000 +0300 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 12:06:43.000000000 +0300 +@@ -504,10 +504,7 @@ + AC_MSG_ERROR(You need (g)make installed in order to build ${PACKAGE}) + fi + +-AM_CONDITIONAL(BUILD_HELP, test x"${HELP2MAN}" != x"") +-if test x"${HELP2MAN}" != x""; then +- PKG_FEATURES="$PKG_FEATURES manpages" +-fi ++AM_CONDITIONAL(BUILD_HELP, test x"" != x"") + + AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"") + if test x"${ASCIIDOC}" != x""; then diff --git a/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch new file mode 100644 index 0000000000..a16854024c --- /dev/null +++ b/recipes/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch @@ -0,0 +1,22 @@ +Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac +=================================================================== +--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-03-16 22:46:38.000000000 +0300 ++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-03-23 00:06:28.000000000 +0300 +@@ -325,7 +325,6 @@ + ;; + *linux*) + AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform) +- CFLAGS="$CFLAGS -I${prefix}/include" + ;; + darwin*) + AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform) +@@ -334,9 +333,6 @@ + ;; + esac + +-dnl Eventually remove this +-CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" +- + AC_SUBST(INIT_EXT) + AC_DEFINE_UNQUOTED(HA_LOG_FACILITY, LOG_DAEMON, Default logging facility) + |