diff options
Diffstat (limited to 'package/pacemaker')
| -rw-r--r-- | package/pacemaker/Makefile | 8 | ||||
| -rw-r--r-- | package/pacemaker/patches/patch-configure | 16 | ||||
| -rw-r--r-- | package/pacemaker/patches/patch-mcp_pacemaker_h | 10 |
3 files changed, 22 insertions, 12 deletions
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index 8d528e655..356515011 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pacemaker PKG_VERSION:= 1.1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 6f87e80f3c9782af5b4d184742c66a3a +PKG_MD5SUM:= 818682b8d937e6c6a6e5f999528328a5 PKG_DESCR:= scalable High-Availability cluster resource manager PKG_SECTION:= ha -PKG_BUILDDEP:= resource-agents cluster-glue pam gnutls corosync -PKG_DEPENDS:= python2 python2-readline python2-bzip2 cluster-glue -PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 +PKG_BUILDDEP:= resource-agents cluster-glue pam gnutls corosync libtool +PKG_DEPENDS:= python2 python2-readline python2-bzip2 cluster-glue libuuid +PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 libltdl PKG_URL:= http://www.clusterlabs.org/ PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure index 320b06924..363b8595e 100644 --- a/package/pacemaker/patches/patch-configure +++ b/package/pacemaker/patches/patch-configure @@ -1,6 +1,6 @@ ---- pacemaker-1.0.11.orig/configure 2011-05-24 17:00:37.000000000 +0200 -+++ pacemaker-1.0.11/configure 2011-10-07 12:41:11.000000000 +0200 -@@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " > +--- pacemaker-1.1.7.orig/configure 2012-07-31 13:24:43.000000000 +0200 ++++ pacemaker-1.1.7/configure 2012-07-31 13:27:31.000000000 +0200 +@@ -12965,7 +12965,7 @@ $as_echo_n "checking for $2 in $1... " > 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 @@ -9,7 +9,7 @@ value=`${Cfile}` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5 $as_echo "$value" >&6; } -@@ -12660,7 +12660,7 @@ case $libdir in +@@ -13208,7 +13208,7 @@ case $libdir in *prefix*|NONE) { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5 $as_echo_n "checking which lib directory to use... " >&6; } @@ -18,7 +18,7 @@ do trydir="${exec_prefix}/${aDir}" if -@@ -12713,33 +12713,11 @@ $as_echo "$as_me: WARNING: $j directory +@@ -13261,33 +13261,11 @@ $as_echo "$as_me: WARNING: $j directory done @@ -49,11 +49,11 @@ -esac - -CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" -+CFLAGS="$CFLAGS -I@@STAGING_DIR@@/usr/include/heartbeat" ++CFLAGS="$CFLAGS -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/heartbeat" - -@@ -17159,7 +17137,6 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: Host CPU: $host_cpu" >&5 +@@ -18920,7 +18898,6 @@ else # We had to eliminate -Wnested-externs because of libtool changes EXTRA_FLAGS="-fgnu89-inline diff --git a/package/pacemaker/patches/patch-mcp_pacemaker_h b/package/pacemaker/patches/patch-mcp_pacemaker_h new file mode 100644 index 000000000..8848e6976 --- /dev/null +++ b/package/pacemaker/patches/patch-mcp_pacemaker_h @@ -0,0 +1,10 @@ +--- pacemaker-1.1.7.orig/mcp/pacemaker.h 2012-03-28 08:14:13.000000000 +0200 ++++ pacemaker-1.1.7/mcp/pacemaker.h 2012-07-31 13:43:39.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/wait.h> ++#include <sys/resource.h> + + #include <stdint.h> + |