diff options
Diffstat (limited to 'package/pacemaker')
| -rw-r--r-- | package/pacemaker/Makefile | 16 | ||||
| -rw-r--r-- | package/pacemaker/patches/patch-configure | 63 | ||||
| -rw-r--r-- | package/pacemaker/patches/patch-mcp_pacemaker_h | 10 |
3 files changed, 3 insertions, 86 deletions
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index b81855345..9168fd64d 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pacemaker -PKG_VERSION:= 1.1.7 +PKG_VERSION:= 1.1.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 818682b8d937e6c6a6e5f999528328a5 +PKG_MD5SUM:= 3aaa95da2bdce96e0c244a2fb0e8b1e3 PKG_DESCR:= scalable High-Availability cluster resource manager PKG_SECTION:= ha 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_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 libltdl librt PKG_URL:= http://www.clusterlabs.org/ PKG_SITES:= http://openadk.org/distfiles/ @@ -22,27 +22,17 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -# disable honour cflags stuff -XAKE_FLAGS+= GCC_HONOUR_COPTS=s - CONFIGURE_ARGS+= --disable-fatal-warnings \ --with-corosync \ --without-ais \ --without-heartbeat CONFIGURE_ENV+= ac_cv_path_HELP2MAN='' -CFLAGS_FOR_BUILD+= -I$(STAGING_DIR)/usr/include/heartbeat -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/heartbeat - -pre-configure: - $(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" $(WRKBUILD)/configure pacemaker-install: $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/heartbeat $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/ocf $(CP) $(WRKINST)/usr/lib/lib*.so* \ $(IDIR_PACEMAKER)/usr/lib - $(CP) $(WRKINST)/usr/lib/heartbeat/* \ - $(IDIR_PACEMAKER)/usr/lib/heartbeat $(CP) $(WRKINST)/usr/lib/ocf/* \ $(IDIR_PACEMAKER)/usr/lib/ocf $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/share/pacemaker diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure deleted file mode 100644 index 363b8595e..000000000 --- a/package/pacemaker/patches/patch-configure +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 -- $CC $CFLAGS ${Cfile}.c -o ${Cfile} -+ $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile} - value=`${Cfile}` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5 - $as_echo "$value" >&6; } -@@ -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; } -- for aDir in lib64 lib -+ for aDir in lib - do - trydir="${exec_prefix}/${aDir}" - if -@@ -13261,33 +13261,11 @@ $as_echo "$as_me: WARNING: $j directory - done - - --case "$host_os" in --*bsd*) LIBS="-L/usr/local/lib" -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- INIT_EXT=".sh" -- ;; --*solaris*) -- ;; --*linux*) -- - cat >>confdefs.h <<_ACEOF - #define ON_LINUX 1 - _ACEOF - -- CFLAGS="$CFLAGS -I${prefix}/include" -- ;; --darwin*) -- --cat >>confdefs.h <<_ACEOF --#define ON_DARWIN 1 --_ACEOF -- -- LIBS="$LIBS -L${prefix}/lib" -- CFLAGS="$CFLAGS -I${prefix}/include" -- ;; --esac -- --CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" -+CFLAGS="$CFLAGS -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/heartbeat" - - - { $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 -- -fstack-protector-all - -Wall - -Waggregate-return - -Wbad-function-cast diff --git a/package/pacemaker/patches/patch-mcp_pacemaker_h b/package/pacemaker/patches/patch-mcp_pacemaker_h deleted file mode 100644 index 8848e6976..000000000 --- a/package/pacemaker/patches/patch-mcp_pacemaker_h +++ /dev/null @@ -1,10 +0,0 @@ ---- 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> - |