add libaio, update cluster-glue

7 files changed, 86 insertions, 16 deletions

diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index 170ae3a08..5e45c71ad 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -4,12 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cluster-glue
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.0.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		237d396094a3cded73f9f0ad45558a21
+PKG_MD5SUM:=		67e35a8e1a78376af039aa53644f0de2
 PKG_DESCR:=		Cluster Glue library and tools
 PKG_SECTION:=		ha
-PKG_BUILDDEP:=		glib bzip2 e2fsprogs
+PKG_BUILDDEP:=		glib bzip2 e2fsprogs libaio
+PKG_DEPENDS:=		libaio
 PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -26,6 +27,17 @@ CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
 CONFIGURE_ARGS+=	--disable-bundled-ltdl \
 			--enable-fatal-warnings=no
 
+TARGET_CPPFLAGS+=	-DCONFIG_LITTLE_ENDIAN
+ifeq (${CPU_ARCH},mips)
+TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
+endif
+ifeq (${CPU_ARCH},mips64)
+TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
+endif
+ifeq (${CPU_ARCH},ppc)
+TARGET_CPPFLAGS+=		-DCONFIG_BIG_ENDIAN
+endif
+
 cluster-glue-install:
 	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
 	$(CP) $(WRKINST)/usr/lib/*.so* \
diff --git a/package/cluster-glue/patches/patch-Makefile_in b/package/cluster-glue/patches/patch-Makefile_in
deleted file mode 100644
index 5fe714457..000000000
--- a/package/cluster-glue/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- cluster-glue-1.0.7.orig/Makefile.in	2011-05-24 14:40:31.000000000 +0200
-+++ cluster-glue-1.0.7/Makefile.in	2012-03-17 01:31:46.039012581 +0100
-@@ -319,7 +319,7 @@ top_srcdir = @top_srcdir@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
- 			  DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
- 
--SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd hb_report doc
-+SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd hb_report
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/package/libaio/Makefile b/package/libaio/Makefile
new file mode 100644
index 000000000..1dbeeee19
--- /dev/null
+++ b/package/libaio/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libaio
+PKG_VERSION:=		0.3.109
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		435a5b16ca6198eaf01155263d855756
+PKG_DESCR:=		Asynchronous I/O library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.kernel.org
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+XAKE_FLAGS+=         	prefix='${WRKINST}/usr'
+
+
+libaio-install:
+	$(INSTALL_DIR) $(IDIR_LIBAIO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libaio*so* \
+		$(IDIR_LIBAIO)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libaio/patches/patch-src_Makefile b/package/libaio/patches/patch-src_Makefile
new file mode 100644
index 000000000..8fb63f7b6
--- /dev/null
+++ b/package/libaio/patches/patch-src_Makefile
@@ -0,0 +1,26 @@
+--- libaio-0.3.109.orig/src/Makefile	2009-10-09 20:17:02.000000000 +0200
++++ libaio-0.3.109/src/Makefile	2012-08-18 12:47:38.000000000 +0200
+@@ -3,7 +3,8 @@ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
+ 
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+-CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS ?= -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS += -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS=
+@@ -51,9 +52,10 @@ $(libname): $(libaio_sobjs) libaio.map
+ 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
+ 
+ install: $(all_targets)
+-	install -D -m 644 libaio.h $(includedir)/libaio.h
+-	install -D -m 644 libaio.a $(libdir)/libaio.a
+-	install -D -m 755 $(libname) $(libdir)/$(libname)
++	mkdir -p $(includedir) $(libdir)
++	install -m 644 libaio.h $(includedir)/libaio.h
++	install -m 644 libaio.a $(libdir)/libaio.a
++	install -m 755 $(libname) $(libdir)/$(libname)
+ 	ln -sf $(libname) $(libdir)/$(soname)
+ 	ln -sf $(libname) $(libdir)/libaio.so
+ 
diff --git a/package/libaio/patches/patch-src_Makefile.orig b/package/libaio/patches/patch-src_Makefile.orig
new file mode 100644
index 000000000..8e6a08179
--- /dev/null
+++ b/package/libaio/patches/patch-src_Makefile.orig
@@ -0,0 +1,12 @@
+--- libaio-0.3.109.orig/src/Makefile	2009-10-09 20:17:02.000000000 +0200
++++ libaio-0.3.109/src/Makefile	2012-08-18 12:46:43.000000000 +0200
+@@ -3,7 +3,8 @@ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
+ 
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+-CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS ?= -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
++CFLAGS += -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS=
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index eafeea47b..6a3ddb3f2 100644
--- a/package/libqb/Makefile
+++ b/package/libqb/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		libs
 PKG_URL:=		https://github.com/asalkeld/libqb/wiki#wiki-Releases
 PKG_SITES:=		https://fedorahosted.org/releases/q/u/quarterback/
 
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBQB,libqb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index 356515011..b81855345 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -25,9 +25,13 @@ $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${P
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-CONFIGURE_ARGS+=	--disable-fatal-warnings
+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