fix pacemaker and pacemaker-mgmt build

4 files changed, 53 insertions, 0 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-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-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