6 files changed, 53 insertions, 73 deletions
diff --git a/package/pacemaker/patches/patch-cib_Makefile_in b/package/pacemaker/patches/patch-cib_Makefile_in
new file mode 100644
index 000000000..c95cdf227
--- /dev/null
+++ b/package/pacemaker/patches/patch-cib_Makefile_in
@@ -0,0 +1,11 @@
+--- pacemaker-1.1.8.orig/cib/Makefile.in	2013-02-28 11:07:10.000000000 +0100
++++ pacemaker-1.1.8/cib/Makefile.in	2013-02-28 11:23:15.000000000 +0100
+@@ -450,6 +450,8 @@ hadir = $(sysconfdir)/ha.d
+ halibdir = $(CRM_DAEMON_DIR)
+ commmoddir = $(halibdir)/modules/comm
+ COMMONLIBS = $(top_builddir)/lib/common/libcrmcommon.la	\
++		$(top_builddir)/lib/fencing/libstonithd.la \
++		$(top_builddir)/lib/pengine/libpe_rules.la \
+ 		  $(top_builddir)/lib/cib/libcib.la
+ 
+ @BUILD_HELP_TRUE@man8_MANS = 
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-lrmd_Makefile_in b/package/pacemaker/patches/patch-lrmd_Makefile_in
new file mode 100644
index 000000000..c30d80227
--- /dev/null
+++ b/package/pacemaker/patches/patch-lrmd_Makefile_in
@@ -0,0 +1,19 @@
+--- pacemaker-1.1.8.orig/lrmd/Makefile.in	2013-02-28 11:07:12.000000000 +0100
++++ pacemaker-1.1.8/lrmd/Makefile.in	2013-02-28 12:16:59.000000000 +0100
+@@ -455,11 +455,14 @@ lrmdlibdir = $(CRM_DAEMON_DIR)
+ lrmd_SOURCES = main.c lrmd.c tls_backend.c
+ lrmd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la	\
+ 			$(top_builddir)/lib/services/libcrmservice.la \
+-			$(top_builddir)/lib/lrmd/liblrmd.la  \
+-			$(top_builddir)/lib/fencing/libstonithd.la
++			$(top_builddir)/lib/pengine/libpe_rules.la \
++			$(top_builddir)/lib/fencing/libstonithd.la \
++			$(top_builddir)/lib/lrmd/liblrmd.la
+ 
+ lrmd_test_SOURCES = test.c
+ lrmd_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la	\
++			$(top_builddir)/lib/pengine/libpe_rules.la \
++			$(top_builddir)/lib/fencing/libstonithd.la \
+ 			$(top_builddir)/lib/lrmd/liblrmd.la  \
+ 			$(top_builddir)/lib/cib/libcib.la   \
+ 			$(top_builddir)/lib/services/libcrmservice.la \
diff --git a/package/pacemaker/patches/patch-mcp_Makefile_in b/package/pacemaker/patches/patch-mcp_Makefile_in
new file mode 100644
index 000000000..a3e72277e
--- /dev/null
+++ b/package/pacemaker/patches/patch-mcp_Makefile_in
@@ -0,0 +1,11 @@
+--- pacemaker-1.1.8.orig/mcp/Makefile.in	2013-02-28 11:07:13.000000000 +0100
++++ pacemaker-1.1.8/mcp/Makefile.in	2013-02-28 11:18:34.000000000 +0100
+@@ -456,7 +456,7 @@ MAINTAINERCLEANFILES = Makefile.in
+ @BUILD_CS_SUPPORT_TRUE@@HAVE_SYSTEMD_TRUE@systemdunit_DATA = pacemaker.service
+ @BUILD_CS_SUPPORT_TRUE@noinst_HEADERS = 
+ @BUILD_CS_SUPPORT_TRUE@pacemakerd_SOURCES = pacemaker.c corosync.c
+-@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la
++@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la
+ @BUILD_CS_SUPPORT_TRUE@pacemakerd_LDFLAGS = $(CLUSTERLIBS)
+ all: all-am
+ 
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>
- 
diff --git a/package/pacemaker/patches/patch-tools_Makefile_in b/package/pacemaker/patches/patch-tools_Makefile_in
new file mode 100644
index 000000000..36d72e3bd
--- /dev/null
+++ b/package/pacemaker/patches/patch-tools_Makefile_in
@@ -0,0 +1,12 @@
+--- pacemaker-1.1.8.orig/tools/Makefile.in	2013-02-28 11:07:13.000000000 +0100
++++ pacemaker-1.1.8/tools/Makefile.in	2013-02-28 12:28:59.000000000 +0100
+@@ -570,6 +570,9 @@ INCLUDES = -I$(top_builddir)/include -I$
+ COMMONLIBS = \
+ 		$(top_builddir)/lib/common/libcrmcommon.la		\
+ 		$(top_builddir)/lib/cib/libcib.la			\
++		$(top_builddir)/lib/pengine/libpe_rules.la \
++		$(top_builddir)/lib/fencing/libstonithd.la \
++		$(top_builddir)/lib/services/libcrmservice.la \
+ 		$(CURSESLIBS) $(CLUSTERLIBS) 
+ 
+ headerdir = $(pkgincludedir)/crm